diff --git a/src/cyclefold/nova_circuit.rs b/src/cyclefold/nova_circuit.rs
index 9fdc9d722..c3fb04c9c 100644
--- a/src/cyclefold/nova_circuit.rs
+++ b/src/cyclefold/nova_circuit.rs
@@ -17,7 +17,6 @@ use bellpepper::gadgets::num::AllocatedNum;
 use bellpepper_core::{ConstraintSystem, SynthesisError};
 use serde::{Deserialize, Serialize};
 
-/// TODO: docs
 #[derive(Clone, PartialEq, Serialize, Deserialize, Abomonation)]
 pub struct AugmentedCircuitParams {
   limb_width: usize,
@@ -47,7 +46,6 @@ impl<E: Engine> FoldingData<E> {
   }
 }
 
-/// TODO: Docs
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(bound = "")]
 pub struct AugmentedCircuitInputs<E1, E2>
@@ -57,16 +55,16 @@ where
 {
   pp_digest: E1::Scalar,
   i: E1::Base,
-  z0: Vec<E1::Scalar>,
+  z0: Vec<E1::Base>,
 
-  zi: Option<Vec<E1::Scalar>>,
-  data_p: Option<FoldingData<E1>>,
+  zi: Option<Vec<E1::Base>>,
+  data_p: Option<FoldingData<E2>>,
 
-  data_c_1: Option<FoldingData<E2>>,
-  data_c_2: Option<FoldingData<E2>>,
+  data_c_1: Option<FoldingData<E1>>,
+  data_c_2: Option<FoldingData<E1>>,
 
-  E_new: Option<Commitment<E1>>,
-  W_new: Option<Commitment<E1>>,
+  E_new: Option<Commitment<E2>>,
+  W_new: Option<Commitment<E2>>,
 }
 
 impl<E1, E2> AugmentedCircuitInputs<E1, E2>
@@ -77,13 +75,13 @@ where
   pub fn new(
     pp_digest: E1::Scalar,
     i: E1::Base,
-    z0: Vec<E1::Scalar>,
-    zi: Option<Vec<E1::Scalar>>,
-    data_p: Option<FoldingData<E1>>,
-    data_c_1: Option<FoldingData<E2>>,
-    data_c_2: Option<FoldingData<E2>>,
-    E_new: Option<Commitment<E1>>,
-    W_new: Option<Commitment<E1>>,
+    z0: Vec<E1::Base>,
+    zi: Option<Vec<E1::Base>>,
+    data_p: Option<FoldingData<E2>>,
+    data_c_1: Option<FoldingData<E1>>,
+    data_c_2: Option<FoldingData<E1>>,
+    E_new: Option<Commitment<E2>>,
+    W_new: Option<Commitment<E2>>,
   ) -> Self {
     Self {
       pp_digest,
@@ -98,12 +96,11 @@ where
     }
   }
 }
-
 pub struct AugmentedCircuit<'a, E1, E2, SC>
 where
   E1: Engine<Base = <E2 as Engine>::Scalar>,
   E2: Engine<Base = <E1 as Engine>::Scalar>,
-  SC: StepCircuit<E1::Scalar>,
+  SC: StepCircuit<E2::Scalar>,
 {
   params: &'a AugmentedCircuitParams,
   ro_consts: ROConstantsCircuit<E1>,
@@ -115,7 +112,7 @@ impl<'a, E1, E2, SC> AugmentedCircuit<'a, E1, E2, SC>
 where
   E1: Engine<Base = <E2 as Engine>::Scalar>,
   E2: Engine<Base = <E1 as Engine>::Scalar>,
-  SC: StepCircuit<E1::Scalar>,
+  SC: StepCircuit<E2::Scalar>,
 {
   pub const fn new(
     params: &'a AugmentedCircuitParams,
@@ -162,7 +159,7 @@ where
   pub fn synthesize<CS: ConstraintSystem<<E1 as Engine>::Base>>(
     self,
     cs: &mut CS,
-  ) -> Result<Vec<AllocatedNum<E1::Scalar>>, SynthesisError> {
+  ) -> Result<Vec<AllocatedNum<E1::Base>>, SynthesisError> {
     // TODO: It's written down here https://hackmd.io/@mpenciak/HybHrnNFT
     todo!()
   }
diff --git a/src/cyclefold/snark.rs b/src/cyclefold/snark.rs
index 566a75972..f764fdae9 100644
--- a/src/cyclefold/snark.rs
+++ b/src/cyclefold/snark.rs
@@ -254,11 +254,11 @@ where
 
     let data_p = FoldingData::new(self.r_U_primary.clone(), self.l_u_primary.clone(), comm_T);
     let data_c_E = FoldingData::new(r_U_cyclefold_E, l_u_cyclefold_E, comm_T_E);
-    let data_c_W = FoldingData::new(r_U_cyclefold_W, l_u_cyclefold_W, comm_T_W);
+    let data_c_W = FoldingData::new(r_U_cyclefold_W.clone(), l_u_cyclefold_W, comm_T_W);
 
-    let inputs_primary = AugmentedCircuitInputs::new(
-      pp.digest(),
-      <E2 as Engine>::Scalar::from(self.i as u64),
+    let inputs_primary: AugmentedCircuitInputs<E2, E1> = AugmentedCircuitInputs::new(
+      scalar_as_base::<E1>(pp.digest()),
+      <E2 as Engine>::Base::from(self.i as u64),
       self.z0_primary.clone(),
       Some(self.zi_primary.clone()),
       Some(data_p),