diff --git a/examples/C/mpc/benchmarks/cryptonets/cryptonets.c b/examples/C/mpc/benchmarks/cryptonets/cryptonets.c
index 61ffa200..f43b552a 100644
--- a/examples/C/mpc/benchmarks/cryptonets/cryptonets.c
+++ b/examples/C/mpc/benchmarks/cryptonets/cryptonets.c
@@ -1,10 +1,10 @@
 // Parameters taken from the paper
-#define IMAGE_WIDTH 28 // 28
+#define IMAGE_WIDTH 16 // 28
 #define WINDOW_WIDTH 5
 #define STRIDE 2
 #define OUTPUT_CHANNELS 5 // 5
 
-#define IMAGE_CROP 13 // 13 with padding
+#define IMAGE_CROP 5 // 13 with padding
 #define SIZE_CONVOLUTION (IMAGE_CROP * IMAGE_CROP) // 169
 
 #define FULLY_CONNECTED_WIDTH 100 // (7, 9)
@@ -20,7 +20,6 @@ DT relu(DT val) {
 	}
 }
 
-
 DT activate_sqr(DT val) {
 	DT res = val*val;
 	return res;
@@ -162,25 +161,67 @@ typedef struct
 	DT final_layer[FINAL_OUTPUT_CHANNELS];
 } Output;
 
+
+DT mmulT_unrolled_inner_2(DT* a, DT* b) { 
+	DT sum = 0;
+	// int i = 0;
+	// // Add the first as groups of eight
+	// for (i=0; i+8< OUTPUT_CHANNELS * SIZE_CONVOLUTION; i+=8) {
+	// 	sum += a[i+0]*b[i+0] + a[i+1]*b[i+1] + a[i+2]*b[i+2] + a[i+3]*b[i+3] + a[i+4]*b[i+4] + a[i+5]*b[i+5] + a[i+6]*b[i+6] + a[i+7]*b[i+7];
+	// }
+	// if(i+4<OUTPUT_CHANNELS * SIZE_CONVOLUTION) {
+	// 	sum += a[i+0]*b[i+0] + a[i+1]*b[i+1] + a[i+2]*b[i+2] + a[i+3]*b[i+3];
+	// 	i+=4;
+	// }
+	// for(i=0; i < OUTPUT_CHANNELS * SIZE_CONVOLUTION; i++) {
+	// 	sum += a[i] * b[i];
+	// }
+	
+	for(int k = 0; k < FULLY_CONNECTED_WIDTH; k++) {
+		sum += a[k] * b[k];
+	}
+	return sum;
+}
+
+
+void mmulT_unrolled_2(DT* a, DT* b, DT *OUTPUT_res) {
+	for(int i = 0; i < FINAL_OUTPUT_CHANNELS; i++) {
+		DT aRow[FULLY_CONNECTED_WIDTH];
+		// memcpy(aRow, a+i*common, common*sizeof(DT));
+        for (int k = 0; k < FULLY_CONNECTED_WIDTH; k++) {
+            aRow[k] = (a+i*FULLY_CONNECTED_WIDTH)[k];
+        }
+
+		for(int j = 0; j < 1; j++) {
+			DT bRow[FULLY_CONNECTED_WIDTH];
+			// memcpy(bRow, b+j*common, common*sizeof(DT));
+            for (int k = 0; k < FULLY_CONNECTED_WIDTH; k++) {
+                bRow[k] = (b+j*FULLY_CONNECTED_WIDTH)[k];
+            }
+			OUTPUT_res[i*1+j] = mmulT_unrolled_inner_2(aRow, bRow);
+		}
+	}
+}
+
+
 DT mmulT_unrolled_inner_1(DT* a, DT* b) { 
 	DT sum = 0;
+	// int i = 0;
+	// // Add the first as groups of eight
+	// for (i=0; i+8< OUTPUT_CHANNELS * SIZE_CONVOLUTION; i+=8) {
+	// 	sum += a[i+0]*b[i+0] + a[i+1]*b[i+1] + a[i+2]*b[i+2] + a[i+3]*b[i+3] + a[i+4]*b[i+4] + a[i+5]*b[i+5] + a[i+6]*b[i+6] + a[i+7]*b[i+7];
+	// }
+	// if(i+4<OUTPUT_CHANNELS * SIZE_CONVOLUTION) {
+	// 	sum += a[i+0]*b[i+0] + a[i+1]*b[i+1] + a[i+2]*b[i+2] + a[i+3]*b[i+3];
+	// 	i+=4;
+	// }
+	// for(i=0; i < OUTPUT_CHANNELS * SIZE_CONVOLUTION; i++) {
+	// 	sum += a[i] * b[i];
+	// }
 	
-	int i = 0;
-	// Add the first as groups of eight
-	for (i=0; i+8< OUTPUT_CHANNELS * SIZE_CONVOLUTION; i+=8) {
-		sum += a[i+0]*b[i+0] + a[i+1]*b[i+1] + a[i+2]*b[i+2] + a[i+3]*b[i+3] + a[i+4]*b[i+4] + a[i+5]*b[i+5] + a[i+6]*b[i+6] + a[i+7]*b[i+7];
-	}
-	if(i+4<OUTPUT_CHANNELS * SIZE_CONVOLUTION) {
-		sum += a[i+0]*b[i+0] + a[i+1]*b[i+1] + a[i+2]*b[i+2] + a[i+3]*b[i+3];
-		i+=4;
-	}
-	for(i=0; i < OUTPUT_CHANNELS * SIZE_CONVOLUTION; i++) {
-		sum += a[i] * b[i];
-	}
-	
-	/*for(int k = 0; k < common; k++) {
+	for(int k = 0; k < OUTPUT_CHANNELS * SIZE_CONVOLUTION; k++) {
 		sum += a[k] * b[k];
-	}*/
+	}
 	return sum;
 }
 
@@ -243,7 +284,7 @@ void convolution_naive_outputs_1(DT *image, DT* kernels, DT* OUTPUT_layer) {
 }
 
 
-int main(__attribute__((private(0))) InputA INPUT_A, __attribute__((private(1))) InputB INPUT_B)
+Output main(__attribute__((private(0))) InputA INPUT_A, __attribute__((private(1))) InputB INPUT_B)
 {
 	Output OUTPUT_classify;		
 	
@@ -278,25 +319,20 @@ int main(__attribute__((private(0))) InputA INPUT_A, __attribute__((private(1)))
     mmulT_unrolled_1(INPUT_B.pool_layer, convolution_layer, im_layer);
 
 
-	// // Activation Function (4)
-	// for(int i = 0; i < FULLY_CONNECTED_WIDTH; i++) {
-	// 	im_layer[i] = activate_sqr(im_layer[i]);
-	// }
-
-	// // Fully Connected (5)
-	// DT final_layer[FINAL_OUTPUT_CHANNELS];
-	// mmulT_unrolled(INPUT_B.fc, im_layer, final_layer, FINAL_OUTPUT_CHANNELS, 1, FULLY_CONNECTED_WIDTH);
-	
-	// for(int i = 0; i < FINAL_OUTPUT_CHANNELS; i++) {
-	// 	OUTPUT_classify.final_layer[i] = final_layer[i];
-	// }
-
-    int sum = 0;
-	for (int i = 0; i < FINAL_OUTPUT_CHANNELS; i++) {
-		sum += OUTPUT_classify.final_layer[i];
+	// Activation Function (4)
+	for(int i = 0; i < FULLY_CONNECTED_WIDTH; i++) {
+		im_layer[i] = activate_sqr(im_layer[i]);
 	}
 
-	// return OUTPUT_classify;
-    return sum;
+	// Fully Connected (5)
+	DT final_layer[FINAL_OUTPUT_CHANNELS];
+	// mmulT_unrolled(INPUT_B.fc, im_layer, final_layer, FINAL_OUTPUT_CHANNELS, 1, FULLY_CONNECTED_WIDTH);
+	mmulT_unrolled_2(INPUT_B.fc, im_layer, final_layer);
+
+	for(int i = 0; i < FINAL_OUTPUT_CHANNELS; i++) {
+		OUTPUT_classify.final_layer[i] = final_layer[i];
+	}
+
+    return OUTPUT_classify;
 }
 
diff --git a/examples/C/mpc/benchmarks/db/db_join.c b/examples/C/mpc/benchmarks/db/db_join.c
index e7076b7e..505fe4d1 100644
--- a/examples/C/mpc/benchmarks/db/db_join.c
+++ b/examples/C/mpc/benchmarks/db/db_join.c
@@ -2,8 +2,8 @@
  * Example on how to merge two data sets and to perform various analyses
  */
 
-#define LEN_A 5
-#define LEN_B 5
+#define LEN_A 50
+#define LEN_B 50
 
 #define ATT_A 2 //Number of attributes
 #define ATT_B 2
diff --git a/scripts/build_mpc_c_test.zsh b/scripts/build_mpc_c_test.zsh
index ced016ee..51209c57 100755
--- a/scripts/build_mpc_c_test.zsh
+++ b/scripts/build_mpc_c_test.zsh
@@ -36,94 +36,96 @@ function mpc_test_bool  {
     RUST_BACKTRACE=1 measure_time $BIN --parties $parties $cpath mpc --cost-model "hycc" --selection-scheme "b"
 }
 
-# build mpc arithmetic tests
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_add.c
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_sub.c
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_mult.c
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_mult_add_pub.c
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_mod.c
-# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_add_unsigned.c
+mpc_test_2 2 ./examples/C/mpc/benchmarks/cryptonets/cryptonets.c
 
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_equals.c
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_greater_than.c
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_greater_equals.c
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_less_than.c
-mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_less_equals.c
+# # build mpc arithmetic tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_add.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_sub.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_mult.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_mult_add_pub.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_mod.c
+# # mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_add_unsigned.c
 
-# build nary arithmetic tests
-mpc_test 2 ./examples/C/mpc/unit_tests/nary_arithmetic_tests/2pc_nary_arithmetic_add.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_equals.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_greater_than.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_greater_equals.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_less_than.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/arithmetic_tests/2pc_int_less_equals.c
 
-# build bitwise tests
-mpc_test 2 ./examples/C/mpc/unit_tests/bitwise_tests/2pc_bitwise_and.c
-mpc_test 2 ./examples/C/mpc/unit_tests/bitwise_tests/2pc_bitwise_or.c
-mpc_test 2 ./examples/C/mpc/unit_tests/bitwise_tests/2pc_bitwise_xor.c
+# # build nary arithmetic tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/nary_arithmetic_tests/2pc_nary_arithmetic_add.c
 
-# build boolean tests
-mpc_test 2 ./examples/C/mpc/unit_tests/boolean_tests/2pc_boolean_and.c
-mpc_test 2 ./examples/C/mpc/unit_tests/boolean_tests/2pc_boolean_or.c
-mpc_test 2 ./examples/C/mpc/unit_tests/boolean_tests/2pc_boolean_equals.c
+# # build bitwise tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/bitwise_tests/2pc_bitwise_and.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/bitwise_tests/2pc_bitwise_or.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/bitwise_tests/2pc_bitwise_xor.c
 
-# build nary boolean tests
-mpc_test 2 ./examples/C/mpc/unit_tests/nary_boolean_tests/2pc_nary_boolean_and.c
+# # build boolean tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/boolean_tests/2pc_boolean_and.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/boolean_tests/2pc_boolean_or.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/boolean_tests/2pc_boolean_equals.c
 
-# build const tests
-mpc_test 2 ./examples/C/mpc/unit_tests/const_tests/2pc_const_arith.c
-mpc_test 2 ./examples/C/mpc/unit_tests/const_tests/2pc_const_bool.c
+# # build nary boolean tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/nary_boolean_tests/2pc_nary_boolean_and.c
 
-# build if statement tests
-mpc_test 2 ./examples/C/mpc/unit_tests/ite_tests/2pc_ite_ret_bool.c
-mpc_test 2 ./examples/C/mpc/unit_tests/ite_tests/2pc_ite_ret_int.c
-mpc_test 2 ./examples/C/mpc/unit_tests/ite_tests/2pc_ite_only_if.c
+# # build const tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/const_tests/2pc_const_arith.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/const_tests/2pc_const_bool.c
 
-# build shift tests
-mpc_test 2 ./examples/C/mpc/unit_tests/shift_tests/2pc_lhs.c
-mpc_test 2 ./examples/C/mpc/unit_tests/shift_tests/2pc_rhs.c
+# # build if statement tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/ite_tests/2pc_ite_ret_bool.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/ite_tests/2pc_ite_ret_int.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/ite_tests/2pc_ite_only_if.c
 
-# build div tests
-mpc_test 2 ./examples/C/mpc/unit_tests/div_tests/2pc_div.c
+# # build shift tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/shift_tests/2pc_lhs.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/shift_tests/2pc_rhs.c
 
-# build array tests
-mpc_test 2 ./examples/C/mpc/unit_tests/array_tests/2pc_array_sum.c
-mpc_test 2 ./examples/C/mpc/unit_tests/array_tests/2pc_array_index.c
-mpc_test 2 ./examples/C/mpc/unit_tests/array_tests/2pc_array_index_2.c
+# # build div tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/div_tests/2pc_div.c
 
-# build circ/compiler array tests
-mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array.c
-mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array_1.c
-mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array_2.c
-mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array_3.c
-mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array_sum_c.c
+# # build array tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/array_tests/2pc_array_sum.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/array_tests/2pc_array_index.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/array_tests/2pc_array_index_2.c
 
-# build function tests
-mpc_test 2 ./examples/C/mpc/unit_tests/function_tests/2pc_function_add.c
+# # build circ/compiler array tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array_1.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array_2.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array_3.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/c_array_tests/2pc_array_sum_c.c
 
-# build struct tests 
-mpc_test 2 ./examples/C/mpc/unit_tests/struct_tests/2pc_struct_add.c
-mpc_test 2 ./examples/C/mpc/unit_tests/struct_tests/2pc_struct_array_add.c
-mpc_test 2 ./examples/C/mpc/unit_tests/struct_tests/ret_struct.c
+# # build function tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/function_tests/2pc_function_add.c
 
-# build matrix tests
-mpc_test 2 ./examples/C/mpc/unit_tests/matrix_tests/2pc_matrix_add.c
-mpc_test 2 ./examples/C/mpc/unit_tests/matrix_tests/2pc_matrix_assign_add.c
-mpc_test 2 ./examples/C/mpc/unit_tests/matrix_tests/2pc_matrix_ptr_add.c
+# # build struct tests 
+# mpc_test 2 ./examples/C/mpc/unit_tests/struct_tests/2pc_struct_add.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/struct_tests/2pc_struct_array_add.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/struct_tests/ret_struct.c
 
-# build ptr tests
-mpc_test 2 ./examples/C/mpc/unit_tests/ptr_tests/2pc_ptr_add.c
-mpc_test 2 ./examples/C/mpc/unit_tests/ptr_tests/2pc_ptr_arith.c
+# # build matrix tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/matrix_tests/2pc_matrix_add.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/matrix_tests/2pc_matrix_assign_add.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/matrix_tests/2pc_matrix_ptr_add.c
 
-# build misc tests
-mpc_test 2 ./examples/C/mpc/unit_tests/misc_tests/2pc_millionaires.c
-mpc_test 2 ./examples/C/mpc/unit_tests/misc_tests/2pc_multi_var.c
+# # build ptr tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/ptr_tests/2pc_ptr_add.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/ptr_tests/2pc_ptr_arith.c
 
-# build hycc benchmarks
-mpc_test 2 ./examples/C/mpc/benchmarks/biomatch/2pc_biomatch.c
-mpc_test 2 ./examples/C/mpc/benchmarks/biomatch/biomatch.c
-mpc_test 2 ./examples/C/mpc/benchmarks/kmeans/2pc_kmeans_.c
-mpc_test 2 ./examples/C/mpc/benchmarks/gauss/2pc_gauss_inline.c
-mpc_test 2 ./examples/C/mpc/benchmarks/db/db_join.c
-mpc_test 2 ./examples/C/mpc/benchmarks/db/db_join2.c
-mpc_test 2 ./examples/C/mpc/benchmarks/db/db_merge.c
-mpc_test 2 ./examples/C/mpc/benchmarks/mnist/mnist.c
+# # build misc tests
+# mpc_test 2 ./examples/C/mpc/unit_tests/misc_tests/2pc_millionaires.c
+# mpc_test 2 ./examples/C/mpc/unit_tests/misc_tests/2pc_multi_var.c
+
+# # build hycc benchmarks
+# mpc_test 2 ./examples/C/mpc/benchmarks/biomatch/2pc_biomatch.c
+# mpc_test 2 ./examples/C/mpc/benchmarks/biomatch/biomatch.c
+# mpc_test 2 ./examples/C/mpc/benchmarks/kmeans/2pc_kmeans_.c
+# mpc_test 2 ./examples/C/mpc/benchmarks/gauss/2pc_gauss_inline.c
+# mpc_test 2 ./examples/C/mpc/benchmarks/db/db_join.c
+# mpc_test 2 ./examples/C/mpc/benchmarks/db/db_join2.c
+# mpc_test 2 ./examples/C/mpc/benchmarks/db/db_merge.c
+# mpc_test 2 ./examples/C/mpc/benchmarks/mnist/mnist.c
 
 # # build hycc benchmarks bool-only
 # mpc_test_bool 2 ./examples/C/mpc/benchmarks/biomatch/2pc_biomatch.c
diff --git a/src/target/aby/trans.rs b/src/target/aby/trans.rs
index 1be44342..5bc025c7 100644
--- a/src/target/aby/trans.rs
+++ b/src/target/aby/trans.rs
@@ -169,13 +169,8 @@ impl<'a> ToABY<'a> {
             .join(" ")
     }
 
-    fn get_md(&self) -> ComputationMetadata {
-        self.fs
-            .computations
-            .get(&self.curr_comp)
-            .unwrap()
-            .metadata
-            .clone()
+    fn get_md(&self) -> &ComputationMetadata {
+        &self.fs.computations.get(&self.curr_comp).unwrap().metadata
     }
 
     fn get_var_name(name: &String) -> String {