diff --git a/Cargo.lock b/Cargo.lock
index c6e60e9..303a17c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -133,6 +133,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
+[[package]]
+name = "cc"
+version = "1.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.3"
@@ -550,6 +560,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3"
+
 [[package]]
 name = "gcd"
 version = "2.3.0"
@@ -998,6 +1014,7 @@ dependencies = [
 name = "p3"
 version = "0.1.0"
 dependencies = [
+ "p3-air",
  "p3-baby-bear",
  "p3-challenger",
  "p3-commit",
@@ -1009,12 +1026,23 @@ dependencies = [
  "p3-maybe-rayon",
  "p3-mds",
  "p3-merkle-tree",
+ "p3-monty-31",
  "p3-poseidon",
  "p3-poseidon2",
+ "p3-poseidon2-air",
  "p3-symmetric",
  "p3-util",
 ]
 
+[[package]]
+name = "p3-air"
+version = "0.1.0"
+source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb"
+dependencies = [
+ "p3-field",
+ "p3-matrix",
+]
+
 [[package]]
 name = "p3-baby-bear"
 version = "0.1.0"
@@ -1230,6 +1258,22 @@ dependencies = [
  "rand",
 ]
 
+[[package]]
+name = "p3-poseidon2-air"
+version = "0.1.0"
+source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb"
+dependencies = [
+ "p3-air",
+ "p3-field",
+ "p3-matrix",
+ "p3-maybe-rayon",
+ "p3-poseidon2",
+ "p3-util",
+ "rand",
+ "tikv-jemallocator",
+ "tracing",
+]
+
 [[package]]
 name = "p3-symmetric"
 version = "0.1.0"
@@ -1631,6 +1675,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signature"
 version = "2.2.0"
@@ -1789,6 +1839,26 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "tikv-jemalloc-sys"
+version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "tikv-jemallocator"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865"
+dependencies = [
+ "libc",
+ "tikv-jemalloc-sys",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
diff --git a/Cargo.toml b/Cargo.toml
index d9fae65..c9606ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,6 +43,7 @@ either = { version = "1.15.*", features = ["serde"] }
 generic-array = { version = "1.1.0", features = ["alloc", "serde"] }
 itertools = "0.13"
 num = "0.4.3"
+p3-air = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-baby-bear = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-challenger = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-commit = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
@@ -54,8 +55,10 @@ p3-matrix = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085
 p3-maybe-rayon = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-mds = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-merkle-tree = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
+p3-monty-31 = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-poseidon = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-poseidon2 = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
+p3-poseidon2-air = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-symmetric = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-util = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 rand = "0.8"
@@ -64,7 +67,7 @@ rand_core = "0.6"
 rayon = "1.10"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
-thiserror = "1"                                                                                                       # do we need this?
+thiserror = "1"                                                                                                         # do we need this?
 tracing = { version = "0.1", features = ["attributes"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/crates/p3/Cargo.toml b/crates/p3/Cargo.toml
index cd16d15..bc4503f 100644
--- a/crates/p3/Cargo.toml
+++ b/crates/p3/Cargo.toml
@@ -10,6 +10,7 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
+p3-air.workspace = true
 p3-baby-bear.workspace = true
 p3-challenger.workspace = true
 p3-commit.workspace = true
@@ -21,8 +22,10 @@ p3-matrix.workspace = true
 p3-maybe-rayon.workspace = true
 p3-mds.workspace = true
 p3-merkle-tree.workspace = true
+p3-monty-31.workspace = true
 p3-poseidon.workspace = true
 p3-poseidon2.workspace = true
+p3-poseidon2-air.workspace = true
 p3-symmetric.workspace = true
 p3-util.workspace = true
 
diff --git a/crates/p3/src/lib.rs b/crates/p3/src/lib.rs
index 525ae94..2fb4a0b 100644
--- a/crates/p3/src/lib.rs
+++ b/crates/p3/src/lib.rs
@@ -1,3 +1,4 @@
+pub use p3_air as air;
 pub use p3_baby_bear as babybear;
 pub use p3_challenger as challenger;
 pub use p3_commit as commit;
@@ -9,7 +10,9 @@ pub use p3_matrix as matrix;
 pub use p3_maybe_rayon as maybe_rayon;
 pub use p3_mds as mds;
 pub use p3_merkle_tree as merkle_tree;
+pub use p3_monty_31 as monty_31;
 pub use p3_poseidon as poseidon;
 pub use p3_poseidon2 as poseidon2;
+pub use p3_poseidon2_air as poseidon2_air;
 pub use p3_symmetric as symmetric;
 pub use p3_util as util;