diff --git a/packages/circom/circuits/common/email_addr_with_name.json b/packages/circom/circuits/common/email_addr_with_name.json
deleted file mode 100644
index 999ea3e..0000000
--- a/packages/circom/circuits/common/email_addr_with_name.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "parts": [
-    {
-      "is_public": false,
-      "regex_def": "[^\r\n]+<"
-    },
-    {
-      "is_public": true,
-      "regex_def": "[A-Za-z0-9!#$%&'*+=?\\-\\^_`{|}~./@]+@[a-zA-Z0-9.\\-]+"
-    },
-    {
-      "is_public": false,
-      "regex_def": ">"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/packages/circom/circuits/common/email_addr_with_name_regex.circom b/packages/circom/circuits/common/email_addr_with_name_regex.circom
index f212271..9e6e781 100644
--- a/packages/circom/circuits/common/email_addr_with_name_regex.circom
+++ b/packages/circom/circuits/common/email_addr_with_name_regex.circom
@@ -1,840 +1,20 @@
 pragma circom 2.1.5;
 
 include "@zk-email/zk-regex-circom/circuits/regex_helpers.circom";
+include "./reversed_email_addr_with_name_regex.circom";
 
-// regex: [^\r\n]+<[A-Za-z0-9!#$%&'*+=?\-\^_`{|}~./@]+@[a-zA-Z0-9.\-]+>
 template EmailAddrWithNameRegex(msg_bytes) {
 	signal input msg[msg_bytes];
 	signal output out;
-
-	var num_bytes = msg_bytes+1;
-	signal in[num_bytes];
-	in[0]<==255;
-	for (var i = 0; i < msg_bytes; i++) {
-		in[i+1] <== msg[i];
-	}
-
-	component eq[91][num_bytes];
-	component lt[26][num_bytes];
-	component and[56][num_bytes];
-	component multi_or[22][num_bytes];
-	signal states[num_bytes+1][14];
-	signal states_tmp[num_bytes+1][14];
-	signal from_zero_enabled[num_bytes+1];
-	from_zero_enabled[num_bytes] <== 0;
-	component state_changed[num_bytes];
-
-	for (var i = 1; i < 14; i++) {
-		states[0][i] <== 0;
-	}
-
-	for (var i = 0; i < num_bytes; i++) {
-		state_changed[i] = MultiOR(13);
-		states[i][0] <== 1;
-		lt[0][i] = LessEqThan(8);
-		lt[0][i].in[0] <== 14;
-		lt[0][i].in[1] <== in[i];
-		lt[1][i] = LessEqThan(8);
-		lt[1][i].in[0] <== in[i];
-		lt[1][i].in[1] <== 127;
-		and[0][i] = AND();
-		and[0][i].a <== lt[0][i].out;
-		and[0][i].b <== lt[1][i].out;
-		eq[0][i] = IsEqual();
-		eq[0][i].in[0] <== in[i];
-		eq[0][i].in[1] <== 1;
-		eq[1][i] = IsEqual();
-		eq[1][i].in[0] <== in[i];
-		eq[1][i].in[1] <== 2;
-		eq[2][i] = IsEqual();
-		eq[2][i].in[0] <== in[i];
-		eq[2][i].in[1] <== 3;
-		eq[3][i] = IsEqual();
-		eq[3][i].in[0] <== in[i];
-		eq[3][i].in[1] <== 4;
-		eq[4][i] = IsEqual();
-		eq[4][i].in[0] <== in[i];
-		eq[4][i].in[1] <== 5;
-		eq[5][i] = IsEqual();
-		eq[5][i].in[0] <== in[i];
-		eq[5][i].in[1] <== 6;
-		eq[6][i] = IsEqual();
-		eq[6][i].in[0] <== in[i];
-		eq[6][i].in[1] <== 7;
-		eq[7][i] = IsEqual();
-		eq[7][i].in[0] <== in[i];
-		eq[7][i].in[1] <== 8;
-		eq[8][i] = IsEqual();
-		eq[8][i].in[0] <== in[i];
-		eq[8][i].in[1] <== 9;
-		eq[9][i] = IsEqual();
-		eq[9][i].in[0] <== in[i];
-		eq[9][i].in[1] <== 11;
-		eq[10][i] = IsEqual();
-		eq[10][i].in[0] <== in[i];
-		eq[10][i].in[1] <== 12;
-		and[1][i] = AND();
-		and[1][i].a <== states[i][0];
-		multi_or[0][i] = MultiOR(12);
-		multi_or[0][i].in[0] <== and[0][i].out;
-		multi_or[0][i].in[1] <== eq[0][i].out;
-		multi_or[0][i].in[2] <== eq[1][i].out;
-		multi_or[0][i].in[3] <== eq[2][i].out;
-		multi_or[0][i].in[4] <== eq[3][i].out;
-		multi_or[0][i].in[5] <== eq[4][i].out;
-		multi_or[0][i].in[6] <== eq[5][i].out;
-		multi_or[0][i].in[7] <== eq[6][i].out;
-		multi_or[0][i].in[8] <== eq[7][i].out;
-		multi_or[0][i].in[9] <== eq[8][i].out;
-		multi_or[0][i].in[10] <== eq[9][i].out;
-		multi_or[0][i].in[11] <== eq[10][i].out;
-		and[1][i].b <== multi_or[0][i].out;
-		lt[2][i] = LessEqThan(8);
-		lt[2][i].in[0] <== 14;
-		lt[2][i].in[1] <== in[i];
-		lt[3][i] = LessEqThan(8);
-		lt[3][i].in[0] <== in[i];
-		lt[3][i].in[1] <== 59;
-		and[2][i] = AND();
-		and[2][i].a <== lt[2][i].out;
-		and[2][i].b <== lt[3][i].out;
-		lt[4][i] = LessEqThan(8);
-		lt[4][i].in[0] <== 61;
-		lt[4][i].in[1] <== in[i];
-		lt[5][i] = LessEqThan(8);
-		lt[5][i].in[0] <== in[i];
-		lt[5][i].in[1] <== 127;
-		and[3][i] = AND();
-		and[3][i].a <== lt[4][i].out;
-		and[3][i].b <== lt[5][i].out;
-		and[4][i] = AND();
-		and[4][i].a <== states[i][1];
-		multi_or[1][i] = MultiOR(13);
-		multi_or[1][i].in[0] <== and[2][i].out;
-		multi_or[1][i].in[1] <== and[3][i].out;
-		multi_or[1][i].in[2] <== eq[0][i].out;
-		multi_or[1][i].in[3] <== eq[1][i].out;
-		multi_or[1][i].in[4] <== eq[2][i].out;
-		multi_or[1][i].in[5] <== eq[3][i].out;
-		multi_or[1][i].in[6] <== eq[4][i].out;
-		multi_or[1][i].in[7] <== eq[5][i].out;
-		multi_or[1][i].in[8] <== eq[6][i].out;
-		multi_or[1][i].in[9] <== eq[7][i].out;
-		multi_or[1][i].in[10] <== eq[8][i].out;
-		multi_or[1][i].in[11] <== eq[9][i].out;
-		multi_or[1][i].in[12] <== eq[10][i].out;
-		and[4][i].b <== multi_or[1][i].out;
-		lt[6][i] = LessEqThan(8);
-		lt[6][i].in[0] <== 128;
-		lt[6][i].in[1] <== in[i];
-		lt[7][i] = LessEqThan(8);
-		lt[7][i].in[0] <== in[i];
-		lt[7][i].in[1] <== 191;
-		and[5][i] = AND();
-		and[5][i].a <== lt[6][i].out;
-		and[5][i].b <== lt[7][i].out;
-		and[6][i] = AND();
-		and[6][i].a <== states[i][2];
-		and[6][i].b <== and[5][i].out;
-		lt[8][i] = LessEqThan(8);
-		lt[8][i].in[0] <== 14;
-		lt[8][i].in[1] <== in[i];
-		lt[9][i] = LessEqThan(8);
-		lt[9][i].in[0] <== in[i];
-		lt[9][i].in[1] <== 32;
-		and[7][i] = AND();
-		and[7][i].a <== lt[8][i].out;
-		and[7][i].b <== lt[9][i].out;
-		eq[11][i] = IsEqual();
-		eq[11][i].in[0] <== in[i];
-		eq[11][i].in[1] <== 34;
-		eq[12][i] = IsEqual();
-		eq[12][i].in[0] <== in[i];
-		eq[12][i].in[1] <== 40;
-		eq[13][i] = IsEqual();
-		eq[13][i].in[0] <== in[i];
-		eq[13][i].in[1] <== 41;
-		eq[14][i] = IsEqual();
-		eq[14][i].in[0] <== in[i];
-		eq[14][i].in[1] <== 44;
-		eq[15][i] = IsEqual();
-		eq[15][i].in[0] <== in[i];
-		eq[15][i].in[1] <== 58;
-		eq[16][i] = IsEqual();
-		eq[16][i].in[0] <== in[i];
-		eq[16][i].in[1] <== 59;
-		eq[17][i] = IsEqual();
-		eq[17][i].in[0] <== in[i];
-		eq[17][i].in[1] <== 62;
-		eq[18][i] = IsEqual();
-		eq[18][i].in[0] <== in[i];
-		eq[18][i].in[1] <== 91;
-		eq[19][i] = IsEqual();
-		eq[19][i].in[0] <== in[i];
-		eq[19][i].in[1] <== 92;
-		eq[20][i] = IsEqual();
-		eq[20][i].in[0] <== in[i];
-		eq[20][i].in[1] <== 93;
-		eq[21][i] = IsEqual();
-		eq[21][i].in[0] <== in[i];
-		eq[21][i].in[1] <== 127;
-		and[8][i] = AND();
-		and[8][i].a <== states[i][9];
-		multi_or[2][i] = MultiOR(23);
-		multi_or[2][i].in[0] <== and[7][i].out;
-		multi_or[2][i].in[1] <== eq[0][i].out;
-		multi_or[2][i].in[2] <== eq[1][i].out;
-		multi_or[2][i].in[3] <== eq[2][i].out;
-		multi_or[2][i].in[4] <== eq[3][i].out;
-		multi_or[2][i].in[5] <== eq[4][i].out;
-		multi_or[2][i].in[6] <== eq[5][i].out;
-		multi_or[2][i].in[7] <== eq[6][i].out;
-		multi_or[2][i].in[8] <== eq[7][i].out;
-		multi_or[2][i].in[9] <== eq[8][i].out;
-		multi_or[2][i].in[10] <== eq[9][i].out;
-		multi_or[2][i].in[11] <== eq[10][i].out;
-		multi_or[2][i].in[12] <== eq[11][i].out;
-		multi_or[2][i].in[13] <== eq[12][i].out;
-		multi_or[2][i].in[14] <== eq[13][i].out;
-		multi_or[2][i].in[15] <== eq[14][i].out;
-		multi_or[2][i].in[16] <== eq[15][i].out;
-		multi_or[2][i].in[17] <== eq[16][i].out;
-		multi_or[2][i].in[18] <== eq[17][i].out;
-		multi_or[2][i].in[19] <== eq[18][i].out;
-		multi_or[2][i].in[20] <== eq[19][i].out;
-		multi_or[2][i].in[21] <== eq[20][i].out;
-		multi_or[2][i].in[22] <== eq[21][i].out;
-		and[8][i].b <== multi_or[2][i].out;
-		multi_or[3][i] = MultiOR(3);
-		multi_or[3][i].in[0] <== and[4][i].out;
-		multi_or[3][i].in[1] <== and[6][i].out;
-		multi_or[3][i].in[2] <== and[8][i].out;
-		states_tmp[i+1][1] <== multi_or[3][i].out;
-		lt[10][i] = LessEqThan(8);
-		lt[10][i].in[0] <== 194;
-		lt[10][i].in[1] <== in[i];
-		lt[11][i] = LessEqThan(8);
-		lt[11][i].in[0] <== in[i];
-		lt[11][i].in[1] <== 223;
-		and[9][i] = AND();
-		and[9][i].a <== lt[10][i].out;
-		and[9][i].b <== lt[11][i].out;
-		and[10][i] = AND();
-		and[10][i].a <== states[i][0];
-		and[10][i].b <== and[9][i].out;
-		and[11][i] = AND();
-		and[11][i].a <== states[i][1];
-		and[11][i].b <== and[9][i].out;
-		lt[12][i] = LessEqThan(8);
-		lt[12][i].in[0] <== 160;
-		lt[12][i].in[1] <== in[i];
-		lt[13][i] = LessEqThan(8);
-		lt[13][i].in[0] <== in[i];
-		lt[13][i].in[1] <== 191;
-		and[12][i] = AND();
-		and[12][i].a <== lt[12][i].out;
-		and[12][i].b <== lt[13][i].out;
-		and[13][i] = AND();
-		and[13][i].a <== states[i][3];
-		and[13][i].b <== and[12][i].out;
-		and[14][i] = AND();
-		and[14][i].a <== states[i][4];
-		and[14][i].b <== and[5][i].out;
-		lt[14][i] = LessEqThan(8);
-		lt[14][i].in[0] <== 128;
-		lt[14][i].in[1] <== in[i];
-		lt[15][i] = LessEqThan(8);
-		lt[15][i].in[0] <== in[i];
-		lt[15][i].in[1] <== 159;
-		and[15][i] = AND();
-		and[15][i].a <== lt[14][i].out;
-		and[15][i].b <== lt[15][i].out;
-		and[16][i] = AND();
-		and[16][i].a <== states[i][5];
-		and[16][i].b <== and[15][i].out;
-		and[17][i] = AND();
-		and[17][i].a <== states[i][9];
-		and[17][i].b <== and[9][i].out;
-		multi_or[4][i] = MultiOR(5);
-		multi_or[4][i].in[0] <== and[11][i].out;
-		multi_or[4][i].in[1] <== and[13][i].out;
-		multi_or[4][i].in[2] <== and[14][i].out;
-		multi_or[4][i].in[3] <== and[16][i].out;
-		multi_or[4][i].in[4] <== and[17][i].out;
-		states_tmp[i+1][2] <== multi_or[4][i].out;
-		eq[22][i] = IsEqual();
-		eq[22][i].in[0] <== in[i];
-		eq[22][i].in[1] <== 224;
-		and[18][i] = AND();
-		and[18][i].a <== states[i][0];
-		and[18][i].b <== eq[22][i].out;
-		and[19][i] = AND();
-		and[19][i].a <== states[i][1];
-		and[19][i].b <== eq[22][i].out;
-		and[20][i] = AND();
-		and[20][i].a <== states[i][9];
-		and[20][i].b <== eq[22][i].out;
-		multi_or[5][i] = MultiOR(2);
-		multi_or[5][i].in[0] <== and[19][i].out;
-		multi_or[5][i].in[1] <== and[20][i].out;
-		states_tmp[i+1][3] <== multi_or[5][i].out;
-		eq[23][i] = IsEqual();
-		eq[23][i].in[0] <== in[i];
-		eq[23][i].in[1] <== 225;
-		eq[24][i] = IsEqual();
-		eq[24][i].in[0] <== in[i];
-		eq[24][i].in[1] <== 226;
-		eq[25][i] = IsEqual();
-		eq[25][i].in[0] <== in[i];
-		eq[25][i].in[1] <== 227;
-		eq[26][i] = IsEqual();
-		eq[26][i].in[0] <== in[i];
-		eq[26][i].in[1] <== 228;
-		eq[27][i] = IsEqual();
-		eq[27][i].in[0] <== in[i];
-		eq[27][i].in[1] <== 229;
-		eq[28][i] = IsEqual();
-		eq[28][i].in[0] <== in[i];
-		eq[28][i].in[1] <== 230;
-		eq[29][i] = IsEqual();
-		eq[29][i].in[0] <== in[i];
-		eq[29][i].in[1] <== 231;
-		eq[30][i] = IsEqual();
-		eq[30][i].in[0] <== in[i];
-		eq[30][i].in[1] <== 232;
-		eq[31][i] = IsEqual();
-		eq[31][i].in[0] <== in[i];
-		eq[31][i].in[1] <== 233;
-		eq[32][i] = IsEqual();
-		eq[32][i].in[0] <== in[i];
-		eq[32][i].in[1] <== 234;
-		eq[33][i] = IsEqual();
-		eq[33][i].in[0] <== in[i];
-		eq[33][i].in[1] <== 235;
-		eq[34][i] = IsEqual();
-		eq[34][i].in[0] <== in[i];
-		eq[34][i].in[1] <== 236;
-		eq[35][i] = IsEqual();
-		eq[35][i].in[0] <== in[i];
-		eq[35][i].in[1] <== 238;
-		eq[36][i] = IsEqual();
-		eq[36][i].in[0] <== in[i];
-		eq[36][i].in[1] <== 239;
-		and[21][i] = AND();
-		and[21][i].a <== states[i][0];
-		multi_or[6][i] = MultiOR(14);
-		multi_or[6][i].in[0] <== eq[23][i].out;
-		multi_or[6][i].in[1] <== eq[24][i].out;
-		multi_or[6][i].in[2] <== eq[25][i].out;
-		multi_or[6][i].in[3] <== eq[26][i].out;
-		multi_or[6][i].in[4] <== eq[27][i].out;
-		multi_or[6][i].in[5] <== eq[28][i].out;
-		multi_or[6][i].in[6] <== eq[29][i].out;
-		multi_or[6][i].in[7] <== eq[30][i].out;
-		multi_or[6][i].in[8] <== eq[31][i].out;
-		multi_or[6][i].in[9] <== eq[32][i].out;
-		multi_or[6][i].in[10] <== eq[33][i].out;
-		multi_or[6][i].in[11] <== eq[34][i].out;
-		multi_or[6][i].in[12] <== eq[35][i].out;
-		multi_or[6][i].in[13] <== eq[36][i].out;
-		and[21][i].b <== multi_or[6][i].out;
-		and[22][i] = AND();
-		and[22][i].a <== states[i][1];
-		and[22][i].b <== multi_or[6][i].out;
-		lt[16][i] = LessEqThan(8);
-		lt[16][i].in[0] <== 144;
-		lt[16][i].in[1] <== in[i];
-		lt[17][i] = LessEqThan(8);
-		lt[17][i].in[0] <== in[i];
-		lt[17][i].in[1] <== 191;
-		and[23][i] = AND();
-		and[23][i].a <== lt[16][i].out;
-		and[23][i].b <== lt[17][i].out;
-		and[24][i] = AND();
-		and[24][i].a <== states[i][6];
-		and[24][i].b <== and[23][i].out;
-		and[25][i] = AND();
-		and[25][i].a <== states[i][7];
-		and[25][i].b <== and[5][i].out;
-		eq[37][i] = IsEqual();
-		eq[37][i].in[0] <== in[i];
-		eq[37][i].in[1] <== 128;
-		eq[38][i] = IsEqual();
-		eq[38][i].in[0] <== in[i];
-		eq[38][i].in[1] <== 129;
-		eq[39][i] = IsEqual();
-		eq[39][i].in[0] <== in[i];
-		eq[39][i].in[1] <== 130;
-		eq[40][i] = IsEqual();
-		eq[40][i].in[0] <== in[i];
-		eq[40][i].in[1] <== 131;
-		eq[41][i] = IsEqual();
-		eq[41][i].in[0] <== in[i];
-		eq[41][i].in[1] <== 132;
-		eq[42][i] = IsEqual();
-		eq[42][i].in[0] <== in[i];
-		eq[42][i].in[1] <== 133;
-		eq[43][i] = IsEqual();
-		eq[43][i].in[0] <== in[i];
-		eq[43][i].in[1] <== 134;
-		eq[44][i] = IsEqual();
-		eq[44][i].in[0] <== in[i];
-		eq[44][i].in[1] <== 135;
-		eq[45][i] = IsEqual();
-		eq[45][i].in[0] <== in[i];
-		eq[45][i].in[1] <== 136;
-		eq[46][i] = IsEqual();
-		eq[46][i].in[0] <== in[i];
-		eq[46][i].in[1] <== 137;
-		eq[47][i] = IsEqual();
-		eq[47][i].in[0] <== in[i];
-		eq[47][i].in[1] <== 138;
-		eq[48][i] = IsEqual();
-		eq[48][i].in[0] <== in[i];
-		eq[48][i].in[1] <== 139;
-		eq[49][i] = IsEqual();
-		eq[49][i].in[0] <== in[i];
-		eq[49][i].in[1] <== 140;
-		eq[50][i] = IsEqual();
-		eq[50][i].in[0] <== in[i];
-		eq[50][i].in[1] <== 141;
-		eq[51][i] = IsEqual();
-		eq[51][i].in[0] <== in[i];
-		eq[51][i].in[1] <== 142;
-		eq[52][i] = IsEqual();
-		eq[52][i].in[0] <== in[i];
-		eq[52][i].in[1] <== 143;
-		and[26][i] = AND();
-		and[26][i].a <== states[i][8];
-		multi_or[7][i] = MultiOR(16);
-		multi_or[7][i].in[0] <== eq[37][i].out;
-		multi_or[7][i].in[1] <== eq[38][i].out;
-		multi_or[7][i].in[2] <== eq[39][i].out;
-		multi_or[7][i].in[3] <== eq[40][i].out;
-		multi_or[7][i].in[4] <== eq[41][i].out;
-		multi_or[7][i].in[5] <== eq[42][i].out;
-		multi_or[7][i].in[6] <== eq[43][i].out;
-		multi_or[7][i].in[7] <== eq[44][i].out;
-		multi_or[7][i].in[8] <== eq[45][i].out;
-		multi_or[7][i].in[9] <== eq[46][i].out;
-		multi_or[7][i].in[10] <== eq[47][i].out;
-		multi_or[7][i].in[11] <== eq[48][i].out;
-		multi_or[7][i].in[12] <== eq[49][i].out;
-		multi_or[7][i].in[13] <== eq[50][i].out;
-		multi_or[7][i].in[14] <== eq[51][i].out;
-		multi_or[7][i].in[15] <== eq[52][i].out;
-		and[26][i].b <== multi_or[7][i].out;
-		and[27][i] = AND();
-		and[27][i].a <== states[i][9];
-		and[27][i].b <== multi_or[6][i].out;
-		multi_or[8][i] = MultiOR(5);
-		multi_or[8][i].in[0] <== and[22][i].out;
-		multi_or[8][i].in[1] <== and[24][i].out;
-		multi_or[8][i].in[2] <== and[25][i].out;
-		multi_or[8][i].in[3] <== and[26][i].out;
-		multi_or[8][i].in[4] <== and[27][i].out;
-		states_tmp[i+1][4] <== multi_or[8][i].out;
-		eq[53][i] = IsEqual();
-		eq[53][i].in[0] <== in[i];
-		eq[53][i].in[1] <== 237;
-		and[28][i] = AND();
-		and[28][i].a <== states[i][0];
-		and[28][i].b <== eq[53][i].out;
-		and[29][i] = AND();
-		and[29][i].a <== states[i][1];
-		and[29][i].b <== eq[53][i].out;
-		and[30][i] = AND();
-		and[30][i].a <== states[i][9];
-		and[30][i].b <== eq[53][i].out;
-		multi_or[9][i] = MultiOR(2);
-		multi_or[9][i].in[0] <== and[29][i].out;
-		multi_or[9][i].in[1] <== and[30][i].out;
-		states_tmp[i+1][5] <== multi_or[9][i].out;
-		eq[54][i] = IsEqual();
-		eq[54][i].in[0] <== in[i];
-		eq[54][i].in[1] <== 240;
-		and[31][i] = AND();
-		and[31][i].a <== states[i][0];
-		and[31][i].b <== eq[54][i].out;
-		and[32][i] = AND();
-		and[32][i].a <== states[i][1];
-		and[32][i].b <== eq[54][i].out;
-		and[33][i] = AND();
-		and[33][i].a <== states[i][9];
-		and[33][i].b <== eq[54][i].out;
-		multi_or[10][i] = MultiOR(2);
-		multi_or[10][i].in[0] <== and[32][i].out;
-		multi_or[10][i].in[1] <== and[33][i].out;
-		states_tmp[i+1][6] <== multi_or[10][i].out;
-		eq[55][i] = IsEqual();
-		eq[55][i].in[0] <== in[i];
-		eq[55][i].in[1] <== 241;
-		eq[56][i] = IsEqual();
-		eq[56][i].in[0] <== in[i];
-		eq[56][i].in[1] <== 242;
-		eq[57][i] = IsEqual();
-		eq[57][i].in[0] <== in[i];
-		eq[57][i].in[1] <== 243;
-		and[34][i] = AND();
-		and[34][i].a <== states[i][0];
-		multi_or[11][i] = MultiOR(3);
-		multi_or[11][i].in[0] <== eq[55][i].out;
-		multi_or[11][i].in[1] <== eq[56][i].out;
-		multi_or[11][i].in[2] <== eq[57][i].out;
-		and[34][i].b <== multi_or[11][i].out;
-		and[35][i] = AND();
-		and[35][i].a <== states[i][1];
-		and[35][i].b <== multi_or[11][i].out;
-		and[36][i] = AND();
-		and[36][i].a <== states[i][9];
-		and[36][i].b <== multi_or[11][i].out;
-		multi_or[12][i] = MultiOR(2);
-		multi_or[12][i].in[0] <== and[35][i].out;
-		multi_or[12][i].in[1] <== and[36][i].out;
-		states_tmp[i+1][7] <== multi_or[12][i].out;
-		eq[58][i] = IsEqual();
-		eq[58][i].in[0] <== in[i];
-		eq[58][i].in[1] <== 244;
-		and[37][i] = AND();
-		and[37][i].a <== states[i][0];
-		and[37][i].b <== eq[58][i].out;
-		and[38][i] = AND();
-		and[38][i].a <== states[i][1];
-		and[38][i].b <== eq[58][i].out;
-		and[39][i] = AND();
-		and[39][i].a <== states[i][9];
-		and[39][i].b <== eq[58][i].out;
-		multi_or[13][i] = MultiOR(2);
-		multi_or[13][i].in[0] <== and[38][i].out;
-		multi_or[13][i].in[1] <== and[39][i].out;
-		states_tmp[i+1][8] <== multi_or[13][i].out;
-		eq[59][i] = IsEqual();
-		eq[59][i].in[0] <== in[i];
-		eq[59][i].in[1] <== 60;
-		and[40][i] = AND();
-		and[40][i].a <== states[i][1];
-		and[40][i].b <== eq[59][i].out;
-		and[41][i] = AND();
-		and[41][i].a <== states[i][9];
-		and[41][i].b <== eq[59][i].out;
-		multi_or[14][i] = MultiOR(2);
-		multi_or[14][i].in[0] <== and[40][i].out;
-		multi_or[14][i].in[1] <== and[41][i].out;
-		states[i+1][9] <== multi_or[14][i].out;
-		lt[18][i] = LessEqThan(8);
-		lt[18][i].in[0] <== 63;
-		lt[18][i].in[1] <== in[i];
-		lt[19][i] = LessEqThan(8);
-		lt[19][i].in[0] <== in[i];
-		lt[19][i].in[1] <== 90;
-		and[42][i] = AND();
-		and[42][i].a <== lt[18][i].out;
-		and[42][i].b <== lt[19][i].out;
-		lt[20][i] = LessEqThan(8);
-		lt[20][i].in[0] <== 94;
-		lt[20][i].in[1] <== in[i];
-		lt[21][i] = LessEqThan(8);
-		lt[21][i].in[0] <== in[i];
-		lt[21][i].in[1] <== 126;
-		and[43][i] = AND();
-		and[43][i].a <== lt[20][i].out;
-		and[43][i].b <== lt[21][i].out;
-		eq[60][i] = IsEqual();
-		eq[60][i].in[0] <== in[i];
-		eq[60][i].in[1] <== 33;
-		eq[61][i] = IsEqual();
-		eq[61][i].in[0] <== in[i];
-		eq[61][i].in[1] <== 35;
-		eq[62][i] = IsEqual();
-		eq[62][i].in[0] <== in[i];
-		eq[62][i].in[1] <== 36;
-		eq[63][i] = IsEqual();
-		eq[63][i].in[0] <== in[i];
-		eq[63][i].in[1] <== 37;
-		eq[64][i] = IsEqual();
-		eq[64][i].in[0] <== in[i];
-		eq[64][i].in[1] <== 38;
-		eq[65][i] = IsEqual();
-		eq[65][i].in[0] <== in[i];
-		eq[65][i].in[1] <== 39;
-		eq[66][i] = IsEqual();
-		eq[66][i].in[0] <== in[i];
-		eq[66][i].in[1] <== 42;
-		eq[67][i] = IsEqual();
-		eq[67][i].in[0] <== in[i];
-		eq[67][i].in[1] <== 43;
-		eq[68][i] = IsEqual();
-		eq[68][i].in[0] <== in[i];
-		eq[68][i].in[1] <== 45;
-		eq[69][i] = IsEqual();
-		eq[69][i].in[0] <== in[i];
-		eq[69][i].in[1] <== 46;
-		eq[70][i] = IsEqual();
-		eq[70][i].in[0] <== in[i];
-		eq[70][i].in[1] <== 47;
-		eq[71][i] = IsEqual();
-		eq[71][i].in[0] <== in[i];
-		eq[71][i].in[1] <== 48;
-		eq[72][i] = IsEqual();
-		eq[72][i].in[0] <== in[i];
-		eq[72][i].in[1] <== 49;
-		eq[73][i] = IsEqual();
-		eq[73][i].in[0] <== in[i];
-		eq[73][i].in[1] <== 50;
-		eq[74][i] = IsEqual();
-		eq[74][i].in[0] <== in[i];
-		eq[74][i].in[1] <== 51;
-		eq[75][i] = IsEqual();
-		eq[75][i].in[0] <== in[i];
-		eq[75][i].in[1] <== 52;
-		eq[76][i] = IsEqual();
-		eq[76][i].in[0] <== in[i];
-		eq[76][i].in[1] <== 53;
-		eq[77][i] = IsEqual();
-		eq[77][i].in[0] <== in[i];
-		eq[77][i].in[1] <== 54;
-		eq[78][i] = IsEqual();
-		eq[78][i].in[0] <== in[i];
-		eq[78][i].in[1] <== 55;
-		eq[79][i] = IsEqual();
-		eq[79][i].in[0] <== in[i];
-		eq[79][i].in[1] <== 56;
-		eq[80][i] = IsEqual();
-		eq[80][i].in[0] <== in[i];
-		eq[80][i].in[1] <== 57;
-		eq[81][i] = IsEqual();
-		eq[81][i].in[0] <== in[i];
-		eq[81][i].in[1] <== 61;
-		and[44][i] = AND();
-		and[44][i].a <== states[i][9];
-		multi_or[15][i] = MultiOR(24);
-		multi_or[15][i].in[0] <== and[42][i].out;
-		multi_or[15][i].in[1] <== and[43][i].out;
-		multi_or[15][i].in[2] <== eq[60][i].out;
-		multi_or[15][i].in[3] <== eq[61][i].out;
-		multi_or[15][i].in[4] <== eq[62][i].out;
-		multi_or[15][i].in[5] <== eq[63][i].out;
-		multi_or[15][i].in[6] <== eq[64][i].out;
-		multi_or[15][i].in[7] <== eq[65][i].out;
-		multi_or[15][i].in[8] <== eq[66][i].out;
-		multi_or[15][i].in[9] <== eq[67][i].out;
-		multi_or[15][i].in[10] <== eq[68][i].out;
-		multi_or[15][i].in[11] <== eq[69][i].out;
-		multi_or[15][i].in[12] <== eq[70][i].out;
-		multi_or[15][i].in[13] <== eq[71][i].out;
-		multi_or[15][i].in[14] <== eq[72][i].out;
-		multi_or[15][i].in[15] <== eq[73][i].out;
-		multi_or[15][i].in[16] <== eq[74][i].out;
-		multi_or[15][i].in[17] <== eq[75][i].out;
-		multi_or[15][i].in[18] <== eq[76][i].out;
-		multi_or[15][i].in[19] <== eq[77][i].out;
-		multi_or[15][i].in[20] <== eq[78][i].out;
-		multi_or[15][i].in[21] <== eq[79][i].out;
-		multi_or[15][i].in[22] <== eq[80][i].out;
-		multi_or[15][i].in[23] <== eq[81][i].out;
-		and[44][i].b <== multi_or[15][i].out;
-		lt[22][i] = LessEqThan(8);
-		lt[22][i].in[0] <== 65;
-		lt[22][i].in[1] <== in[i];
-		lt[23][i] = LessEqThan(8);
-		lt[23][i].in[0] <== in[i];
-		lt[23][i].in[1] <== 90;
-		and[45][i] = AND();
-		and[45][i].a <== lt[22][i].out;
-		and[45][i].b <== lt[23][i].out;
-		eq[82][i] = IsEqual();
-		eq[82][i].in[0] <== in[i];
-		eq[82][i].in[1] <== 63;
-		and[46][i] = AND();
-		and[46][i].a <== states[i][10];
-		multi_or[16][i] = MultiOR(25);
-		multi_or[16][i].in[0] <== and[45][i].out;
-		multi_or[16][i].in[1] <== and[43][i].out;
-		multi_or[16][i].in[2] <== eq[60][i].out;
-		multi_or[16][i].in[3] <== eq[61][i].out;
-		multi_or[16][i].in[4] <== eq[62][i].out;
-		multi_or[16][i].in[5] <== eq[63][i].out;
-		multi_or[16][i].in[6] <== eq[64][i].out;
-		multi_or[16][i].in[7] <== eq[65][i].out;
-		multi_or[16][i].in[8] <== eq[66][i].out;
-		multi_or[16][i].in[9] <== eq[67][i].out;
-		multi_or[16][i].in[10] <== eq[68][i].out;
-		multi_or[16][i].in[11] <== eq[69][i].out;
-		multi_or[16][i].in[12] <== eq[70][i].out;
-		multi_or[16][i].in[13] <== eq[71][i].out;
-		multi_or[16][i].in[14] <== eq[72][i].out;
-		multi_or[16][i].in[15] <== eq[73][i].out;
-		multi_or[16][i].in[16] <== eq[74][i].out;
-		multi_or[16][i].in[17] <== eq[75][i].out;
-		multi_or[16][i].in[18] <== eq[76][i].out;
-		multi_or[16][i].in[19] <== eq[77][i].out;
-		multi_or[16][i].in[20] <== eq[78][i].out;
-		multi_or[16][i].in[21] <== eq[79][i].out;
-		multi_or[16][i].in[22] <== eq[80][i].out;
-		multi_or[16][i].in[23] <== eq[81][i].out;
-		multi_or[16][i].in[24] <== eq[82][i].out;
-		and[46][i].b <== multi_or[16][i].out;
-		eq[83][i] = IsEqual();
-		eq[83][i].in[0] <== in[i];
-		eq[83][i].in[1] <== 94;
-		eq[84][i] = IsEqual();
-		eq[84][i].in[0] <== in[i];
-		eq[84][i].in[1] <== 95;
-		eq[85][i] = IsEqual();
-		eq[85][i].in[0] <== in[i];
-		eq[85][i].in[1] <== 96;
-		eq[86][i] = IsEqual();
-		eq[86][i].in[0] <== in[i];
-		eq[86][i].in[1] <== 123;
-		eq[87][i] = IsEqual();
-		eq[87][i].in[0] <== in[i];
-		eq[87][i].in[1] <== 124;
-		eq[88][i] = IsEqual();
-		eq[88][i].in[0] <== in[i];
-		eq[88][i].in[1] <== 125;
-		eq[89][i] = IsEqual();
-		eq[89][i].in[0] <== in[i];
-		eq[89][i].in[1] <== 126;
-		and[47][i] = AND();
-		and[47][i].a <== states[i][11];
-		multi_or[17][i] = MultiOR(18);
-		multi_or[17][i].in[0] <== eq[60][i].out;
-		multi_or[17][i].in[1] <== eq[61][i].out;
-		multi_or[17][i].in[2] <== eq[62][i].out;
-		multi_or[17][i].in[3] <== eq[63][i].out;
-		multi_or[17][i].in[4] <== eq[64][i].out;
-		multi_or[17][i].in[5] <== eq[65][i].out;
-		multi_or[17][i].in[6] <== eq[66][i].out;
-		multi_or[17][i].in[7] <== eq[67][i].out;
-		multi_or[17][i].in[8] <== eq[70][i].out;
-		multi_or[17][i].in[9] <== eq[81][i].out;
-		multi_or[17][i].in[10] <== eq[82][i].out;
-		multi_or[17][i].in[11] <== eq[83][i].out;
-		multi_or[17][i].in[12] <== eq[84][i].out;
-		multi_or[17][i].in[13] <== eq[85][i].out;
-		multi_or[17][i].in[14] <== eq[86][i].out;
-		multi_or[17][i].in[15] <== eq[87][i].out;
-		multi_or[17][i].in[16] <== eq[88][i].out;
-		multi_or[17][i].in[17] <== eq[89][i].out;
-		and[47][i].b <== multi_or[17][i].out;
-		and[48][i] = AND();
-		and[48][i].a <== states[i][12];
-		and[48][i].b <== multi_or[17][i].out;
-		multi_or[18][i] = MultiOR(4);
-		multi_or[18][i].in[0] <== and[44][i].out;
-		multi_or[18][i].in[1] <== and[46][i].out;
-		multi_or[18][i].in[2] <== and[47][i].out;
-		multi_or[18][i].in[3] <== and[48][i].out;
-		states[i+1][10] <== multi_or[18][i].out;
-		eq[90][i] = IsEqual();
-		eq[90][i].in[0] <== in[i];
-		eq[90][i].in[1] <== 64;
-		and[49][i] = AND();
-		and[49][i].a <== states[i][10];
-		and[49][i].b <== eq[90][i].out;
-		and[50][i] = AND();
-		and[50][i].a <== states[i][11];
-		and[50][i].b <== eq[90][i].out;
-		and[51][i] = AND();
-		and[51][i].a <== states[i][12];
-		and[51][i].b <== eq[90][i].out;
-		multi_or[19][i] = MultiOR(3);
-		multi_or[19][i].in[0] <== and[49][i].out;
-		multi_or[19][i].in[1] <== and[50][i].out;
-		multi_or[19][i].in[2] <== and[51][i].out;
-		states[i+1][11] <== multi_or[19][i].out;
-		lt[24][i] = LessEqThan(8);
-		lt[24][i].in[0] <== 97;
-		lt[24][i].in[1] <== in[i];
-		lt[25][i] = LessEqThan(8);
-		lt[25][i].in[0] <== in[i];
-		lt[25][i].in[1] <== 122;
-		and[52][i] = AND();
-		and[52][i].a <== lt[24][i].out;
-		and[52][i].b <== lt[25][i].out;
-		and[53][i] = AND();
-		and[53][i].a <== states[i][11];
-		multi_or[20][i] = MultiOR(14);
-		multi_or[20][i].in[0] <== and[45][i].out;
-		multi_or[20][i].in[1] <== and[52][i].out;
-		multi_or[20][i].in[2] <== eq[68][i].out;
-		multi_or[20][i].in[3] <== eq[69][i].out;
-		multi_or[20][i].in[4] <== eq[71][i].out;
-		multi_or[20][i].in[5] <== eq[72][i].out;
-		multi_or[20][i].in[6] <== eq[73][i].out;
-		multi_or[20][i].in[7] <== eq[74][i].out;
-		multi_or[20][i].in[8] <== eq[75][i].out;
-		multi_or[20][i].in[9] <== eq[76][i].out;
-		multi_or[20][i].in[10] <== eq[77][i].out;
-		multi_or[20][i].in[11] <== eq[78][i].out;
-		multi_or[20][i].in[12] <== eq[79][i].out;
-		multi_or[20][i].in[13] <== eq[80][i].out;
-		and[53][i].b <== multi_or[20][i].out;
-		and[54][i] = AND();
-		and[54][i].a <== states[i][12];
-		and[54][i].b <== multi_or[20][i].out;
-		multi_or[21][i] = MultiOR(2);
-		multi_or[21][i].in[0] <== and[53][i].out;
-		multi_or[21][i].in[1] <== and[54][i].out;
-		states[i+1][12] <== multi_or[21][i].out;
-		and[55][i] = AND();
-		and[55][i].a <== states[i][12];
-		and[55][i].b <== eq[17][i].out;
-		states[i+1][13] <== and[55][i].out;
-		from_zero_enabled[i] <== MultiNOR(13)([states_tmp[i+1][1], states_tmp[i+1][2], states_tmp[i+1][3], states_tmp[i+1][4], states_tmp[i+1][5], states_tmp[i+1][6], states_tmp[i+1][7], states_tmp[i+1][8], states[i+1][9], states[i+1][10], states[i+1][11], states[i+1][12], states[i+1][13]]);
-		states[i+1][1] <== MultiOR(2)([states_tmp[i+1][1], from_zero_enabled[i] * and[1][i].out]);
-		states[i+1][2] <== MultiOR(2)([states_tmp[i+1][2], from_zero_enabled[i] * and[10][i].out]);
-		states[i+1][3] <== MultiOR(2)([states_tmp[i+1][3], from_zero_enabled[i] * and[18][i].out]);
-		states[i+1][4] <== MultiOR(2)([states_tmp[i+1][4], from_zero_enabled[i] * and[21][i].out]);
-		states[i+1][5] <== MultiOR(2)([states_tmp[i+1][5], from_zero_enabled[i] * and[28][i].out]);
-		states[i+1][6] <== MultiOR(2)([states_tmp[i+1][6], from_zero_enabled[i] * and[31][i].out]);
-		states[i+1][7] <== MultiOR(2)([states_tmp[i+1][7], from_zero_enabled[i] * and[34][i].out]);
-		states[i+1][8] <== MultiOR(2)([states_tmp[i+1][8], from_zero_enabled[i] * and[37][i].out]);
-		state_changed[i].in[0] <== states[i+1][1];
-		state_changed[i].in[1] <== states[i+1][2];
-		state_changed[i].in[2] <== states[i+1][3];
-		state_changed[i].in[3] <== states[i+1][4];
-		state_changed[i].in[4] <== states[i+1][5];
-		state_changed[i].in[5] <== states[i+1][6];
-		state_changed[i].in[6] <== states[i+1][7];
-		state_changed[i].in[7] <== states[i+1][8];
-		state_changed[i].in[8] <== states[i+1][9];
-		state_changed[i].in[9] <== states[i+1][10];
-		state_changed[i].in[10] <== states[i+1][11];
-		state_changed[i].in[11] <== states[i+1][12];
-		state_changed[i].in[12] <== states[i+1][13];
-	}
-
-	component is_accepted = MultiOR(num_bytes+1);
-	for (var i = 0; i <= num_bytes; i++) {
-		is_accepted.in[i] <== states[i][13];
-	}
-	out <== is_accepted.out;
-	signal is_consecutive[msg_bytes+1][3];
-	is_consecutive[msg_bytes][2] <== 0;
-	for (var i = 0; i < msg_bytes; i++) {
-		is_consecutive[msg_bytes-1-i][0] <== states[num_bytes-i][13] * (1 - is_consecutive[msg_bytes-i][2]) + is_consecutive[msg_bytes-i][2];
-		is_consecutive[msg_bytes-1-i][1] <== state_changed[msg_bytes-i].out * is_consecutive[msg_bytes-1-i][0];
-		is_consecutive[msg_bytes-1-i][2] <== ORAnd()([(1 - from_zero_enabled[msg_bytes-i+1]), states[num_bytes-i][13], is_consecutive[msg_bytes-1-i][1]]);
-	}
-	// substrings calculated: [{(9, 10), (10, 10), (10, 11), (11, 10), (11, 11), (11, 12), (12, 10), (12, 11), (12, 12)}]
-	signal prev_states0[9][msg_bytes];
-	signal is_substr0[msg_bytes];
-	signal is_reveal0[msg_bytes];
 	signal output reveal0[msg_bytes];
-	for (var i = 0; i < msg_bytes; i++) {
-		 // the 0-th substring transitions: [(9, 10), (10, 10), (10, 11), (11, 10), (11, 11), (11, 12), (12, 10), (12, 11), (12, 12)]
-		prev_states0[0][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][9];
-		prev_states0[1][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][10];
-		prev_states0[2][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][10];
-		prev_states0[3][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][11];
-		prev_states0[4][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][11];
-		prev_states0[5][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][11];
-		prev_states0[6][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][12];
-		prev_states0[7][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][12];
-		prev_states0[8][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][12];
-		is_substr0[i] <== MultiOR(9)([prev_states0[0][i] * states[i+2][10], prev_states0[1][i] * states[i+2][10], prev_states0[2][i] * states[i+2][11], prev_states0[3][i] * states[i+2][10], prev_states0[4][i] * states[i+2][11], prev_states0[5][i] * states[i+2][12], prev_states0[6][i] * states[i+2][10], prev_states0[7][i] * states[i+2][11], prev_states0[8][i] * states[i+2][12]]);
-		is_reveal0[i] <== MultiAND(3)([out, is_substr0[i], is_consecutive[i][2]]);
-		reveal0[i] <== in[i+1] * is_reveal0[i];
+	
+	signal reversed_msg[msg_bytes];
+	signal reversed_reveal0[msg_bytes];
+	for(var i=0; i<msg_bytes; i++) {
+		reversed_msg[i] <== msg[msg_bytes - i - 1];
+	}
+	(out, reversed_reveal0) <== ReversedEmailAddrWithNameRegex(msg_bytes)(reversed_msg);
+	for(var i=0; i<msg_bytes; i++) {
+		reveal0[i] <== reversed_reveal0[msg_bytes - i - 1];
 	}
 }
\ No newline at end of file
diff --git a/packages/circom/circuits/common/reversed_email_addr_with_name.json b/packages/circom/circuits/common/reversed_email_addr_with_name.json
new file mode 100644
index 0000000..4c363a9
--- /dev/null
+++ b/packages/circom/circuits/common/reversed_email_addr_with_name.json
@@ -0,0 +1,16 @@
+{
+    "parts": [
+        {
+            "is_public": false,
+            "regex_def": ">"
+        },
+        {
+            "is_public": true,
+            "regex_def": "[a-zA-Z0-9.\\-]+@[A-Za-z0-9!#$%&'*+=?\\-\\^_`{|}~./@]+"
+        },
+        {
+            "is_public": false,
+            "regex_def": "<.*"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/packages/circom/circuits/common/reversed_email_addr_with_name_regex.circom b/packages/circom/circuits/common/reversed_email_addr_with_name_regex.circom
new file mode 100644
index 0000000..809ef2c
--- /dev/null
+++ b/packages/circom/circuits/common/reversed_email_addr_with_name_regex.circom
@@ -0,0 +1,566 @@
+pragma circom 2.1.5;
+
+include "@zk-email/zk-regex-circom/circuits/regex_helpers.circom";
+
+// regex: >[a-zA-Z0-9.\-]+@[A-Za-z0-9!#$%&'*+=?\-\^_`{|}~./@]+<.*
+template ReversedEmailAddrWithNameRegex(msg_bytes) {
+	signal input msg[msg_bytes];
+	signal output out;
+
+	var num_bytes = msg_bytes+1;
+	signal in[num_bytes];
+	in[0]<==255;
+	for (var i = 0; i < msg_bytes; i++) {
+		in[i+1] <== msg[i];
+	}
+
+	component eq[71][num_bytes];
+	component lt[20][num_bytes];
+	component and[32][num_bytes];
+	component multi_or[11][num_bytes];
+	signal states[num_bytes+1][13];
+	signal states_tmp[num_bytes+1][13];
+	signal from_zero_enabled[num_bytes+1];
+	from_zero_enabled[num_bytes] <== 0;
+	component state_changed[num_bytes];
+
+	for (var i = 1; i < 13; i++) {
+		states[0][i] <== 0;
+	}
+
+	for (var i = 0; i < num_bytes; i++) {
+		state_changed[i] = MultiOR(12);
+		states[i][0] <== 1;
+		eq[0][i] = IsEqual();
+		eq[0][i].in[0] <== in[i];
+		eq[0][i].in[1] <== 62;
+		and[0][i] = AND();
+		and[0][i].a <== states[i][0];
+		and[0][i].b <== eq[0][i].out;
+		states_tmp[i+1][1] <== 0;
+		lt[0][i] = LessEqThan(8);
+		lt[0][i].in[0] <== 65;
+		lt[0][i].in[1] <== in[i];
+		lt[1][i] = LessEqThan(8);
+		lt[1][i].in[0] <== in[i];
+		lt[1][i].in[1] <== 90;
+		and[1][i] = AND();
+		and[1][i].a <== lt[0][i].out;
+		and[1][i].b <== lt[1][i].out;
+		lt[2][i] = LessEqThan(8);
+		lt[2][i].in[0] <== 97;
+		lt[2][i].in[1] <== in[i];
+		lt[3][i] = LessEqThan(8);
+		lt[3][i].in[0] <== in[i];
+		lt[3][i].in[1] <== 122;
+		and[2][i] = AND();
+		and[2][i].a <== lt[2][i].out;
+		and[2][i].b <== lt[3][i].out;
+		eq[1][i] = IsEqual();
+		eq[1][i].in[0] <== in[i];
+		eq[1][i].in[1] <== 45;
+		eq[2][i] = IsEqual();
+		eq[2][i].in[0] <== in[i];
+		eq[2][i].in[1] <== 46;
+		eq[3][i] = IsEqual();
+		eq[3][i].in[0] <== in[i];
+		eq[3][i].in[1] <== 48;
+		eq[4][i] = IsEqual();
+		eq[4][i].in[0] <== in[i];
+		eq[4][i].in[1] <== 49;
+		eq[5][i] = IsEqual();
+		eq[5][i].in[0] <== in[i];
+		eq[5][i].in[1] <== 50;
+		eq[6][i] = IsEqual();
+		eq[6][i].in[0] <== in[i];
+		eq[6][i].in[1] <== 51;
+		eq[7][i] = IsEqual();
+		eq[7][i].in[0] <== in[i];
+		eq[7][i].in[1] <== 52;
+		eq[8][i] = IsEqual();
+		eq[8][i].in[0] <== in[i];
+		eq[8][i].in[1] <== 53;
+		eq[9][i] = IsEqual();
+		eq[9][i].in[0] <== in[i];
+		eq[9][i].in[1] <== 54;
+		eq[10][i] = IsEqual();
+		eq[10][i].in[0] <== in[i];
+		eq[10][i].in[1] <== 55;
+		eq[11][i] = IsEqual();
+		eq[11][i].in[0] <== in[i];
+		eq[11][i].in[1] <== 56;
+		eq[12][i] = IsEqual();
+		eq[12][i].in[0] <== in[i];
+		eq[12][i].in[1] <== 57;
+		and[3][i] = AND();
+		and[3][i].a <== states[i][1];
+		multi_or[0][i] = MultiOR(14);
+		multi_or[0][i].in[0] <== and[1][i].out;
+		multi_or[0][i].in[1] <== and[2][i].out;
+		multi_or[0][i].in[2] <== eq[1][i].out;
+		multi_or[0][i].in[3] <== eq[2][i].out;
+		multi_or[0][i].in[4] <== eq[3][i].out;
+		multi_or[0][i].in[5] <== eq[4][i].out;
+		multi_or[0][i].in[6] <== eq[5][i].out;
+		multi_or[0][i].in[7] <== eq[6][i].out;
+		multi_or[0][i].in[8] <== eq[7][i].out;
+		multi_or[0][i].in[9] <== eq[8][i].out;
+		multi_or[0][i].in[10] <== eq[9][i].out;
+		multi_or[0][i].in[11] <== eq[10][i].out;
+		multi_or[0][i].in[12] <== eq[11][i].out;
+		multi_or[0][i].in[13] <== eq[12][i].out;
+		and[3][i].b <== multi_or[0][i].out;
+		and[4][i] = AND();
+		and[4][i].a <== states[i][2];
+		and[4][i].b <== multi_or[0][i].out;
+		multi_or[1][i] = MultiOR(2);
+		multi_or[1][i].in[0] <== and[3][i].out;
+		multi_or[1][i].in[1] <== and[4][i].out;
+		states[i+1][2] <== multi_or[1][i].out;
+		eq[13][i] = IsEqual();
+		eq[13][i].in[0] <== in[i];
+		eq[13][i].in[1] <== 64;
+		and[5][i] = AND();
+		and[5][i].a <== states[i][2];
+		and[5][i].b <== eq[13][i].out;
+		states[i+1][3] <== and[5][i].out;
+		lt[4][i] = LessEqThan(8);
+		lt[4][i].in[0] <== 63;
+		lt[4][i].in[1] <== in[i];
+		lt[5][i] = LessEqThan(8);
+		lt[5][i].in[0] <== in[i];
+		lt[5][i].in[1] <== 90;
+		and[6][i] = AND();
+		and[6][i].a <== lt[4][i].out;
+		and[6][i].b <== lt[5][i].out;
+		lt[6][i] = LessEqThan(8);
+		lt[6][i].in[0] <== 94;
+		lt[6][i].in[1] <== in[i];
+		lt[7][i] = LessEqThan(8);
+		lt[7][i].in[0] <== in[i];
+		lt[7][i].in[1] <== 126;
+		and[7][i] = AND();
+		and[7][i].a <== lt[6][i].out;
+		and[7][i].b <== lt[7][i].out;
+		eq[14][i] = IsEqual();
+		eq[14][i].in[0] <== in[i];
+		eq[14][i].in[1] <== 33;
+		eq[15][i] = IsEqual();
+		eq[15][i].in[0] <== in[i];
+		eq[15][i].in[1] <== 35;
+		eq[16][i] = IsEqual();
+		eq[16][i].in[0] <== in[i];
+		eq[16][i].in[1] <== 36;
+		eq[17][i] = IsEqual();
+		eq[17][i].in[0] <== in[i];
+		eq[17][i].in[1] <== 37;
+		eq[18][i] = IsEqual();
+		eq[18][i].in[0] <== in[i];
+		eq[18][i].in[1] <== 38;
+		eq[19][i] = IsEqual();
+		eq[19][i].in[0] <== in[i];
+		eq[19][i].in[1] <== 39;
+		eq[20][i] = IsEqual();
+		eq[20][i].in[0] <== in[i];
+		eq[20][i].in[1] <== 42;
+		eq[21][i] = IsEqual();
+		eq[21][i].in[0] <== in[i];
+		eq[21][i].in[1] <== 43;
+		eq[22][i] = IsEqual();
+		eq[22][i].in[0] <== in[i];
+		eq[22][i].in[1] <== 47;
+		eq[23][i] = IsEqual();
+		eq[23][i].in[0] <== in[i];
+		eq[23][i].in[1] <== 61;
+		and[8][i] = AND();
+		and[8][i].a <== states[i][3];
+		multi_or[2][i] = MultiOR(24);
+		multi_or[2][i].in[0] <== and[6][i].out;
+		multi_or[2][i].in[1] <== and[7][i].out;
+		multi_or[2][i].in[2] <== eq[14][i].out;
+		multi_or[2][i].in[3] <== eq[15][i].out;
+		multi_or[2][i].in[4] <== eq[16][i].out;
+		multi_or[2][i].in[5] <== eq[17][i].out;
+		multi_or[2][i].in[6] <== eq[18][i].out;
+		multi_or[2][i].in[7] <== eq[19][i].out;
+		multi_or[2][i].in[8] <== eq[20][i].out;
+		multi_or[2][i].in[9] <== eq[21][i].out;
+		multi_or[2][i].in[10] <== eq[1][i].out;
+		multi_or[2][i].in[11] <== eq[2][i].out;
+		multi_or[2][i].in[12] <== eq[22][i].out;
+		multi_or[2][i].in[13] <== eq[3][i].out;
+		multi_or[2][i].in[14] <== eq[4][i].out;
+		multi_or[2][i].in[15] <== eq[5][i].out;
+		multi_or[2][i].in[16] <== eq[6][i].out;
+		multi_or[2][i].in[17] <== eq[7][i].out;
+		multi_or[2][i].in[18] <== eq[8][i].out;
+		multi_or[2][i].in[19] <== eq[9][i].out;
+		multi_or[2][i].in[20] <== eq[10][i].out;
+		multi_or[2][i].in[21] <== eq[11][i].out;
+		multi_or[2][i].in[22] <== eq[12][i].out;
+		multi_or[2][i].in[23] <== eq[23][i].out;
+		and[8][i].b <== multi_or[2][i].out;
+		and[9][i] = AND();
+		and[9][i].a <== states[i][4];
+		and[9][i].b <== multi_or[2][i].out;
+		multi_or[3][i] = MultiOR(2);
+		multi_or[3][i].in[0] <== and[8][i].out;
+		multi_or[3][i].in[1] <== and[9][i].out;
+		states[i+1][4] <== multi_or[3][i].out;
+		eq[24][i] = IsEqual();
+		eq[24][i].in[0] <== in[i];
+		eq[24][i].in[1] <== 60;
+		and[10][i] = AND();
+		and[10][i].a <== states[i][4];
+		and[10][i].b <== eq[24][i].out;
+		lt[8][i] = LessEqThan(8);
+		lt[8][i].in[0] <== 11;
+		lt[8][i].in[1] <== in[i];
+		lt[9][i] = LessEqThan(8);
+		lt[9][i].in[0] <== in[i];
+		lt[9][i].in[1] <== 127;
+		and[11][i] = AND();
+		and[11][i].a <== lt[8][i].out;
+		and[11][i].b <== lt[9][i].out;
+		eq[25][i] = IsEqual();
+		eq[25][i].in[0] <== in[i];
+		eq[25][i].in[1] <== 1;
+		eq[26][i] = IsEqual();
+		eq[26][i].in[0] <== in[i];
+		eq[26][i].in[1] <== 2;
+		eq[27][i] = IsEqual();
+		eq[27][i].in[0] <== in[i];
+		eq[27][i].in[1] <== 3;
+		eq[28][i] = IsEqual();
+		eq[28][i].in[0] <== in[i];
+		eq[28][i].in[1] <== 4;
+		eq[29][i] = IsEqual();
+		eq[29][i].in[0] <== in[i];
+		eq[29][i].in[1] <== 5;
+		eq[30][i] = IsEqual();
+		eq[30][i].in[0] <== in[i];
+		eq[30][i].in[1] <== 6;
+		eq[31][i] = IsEqual();
+		eq[31][i].in[0] <== in[i];
+		eq[31][i].in[1] <== 7;
+		eq[32][i] = IsEqual();
+		eq[32][i].in[0] <== in[i];
+		eq[32][i].in[1] <== 8;
+		eq[33][i] = IsEqual();
+		eq[33][i].in[0] <== in[i];
+		eq[33][i].in[1] <== 9;
+		and[12][i] = AND();
+		and[12][i].a <== states[i][5];
+		multi_or[4][i] = MultiOR(10);
+		multi_or[4][i].in[0] <== and[11][i].out;
+		multi_or[4][i].in[1] <== eq[25][i].out;
+		multi_or[4][i].in[2] <== eq[26][i].out;
+		multi_or[4][i].in[3] <== eq[27][i].out;
+		multi_or[4][i].in[4] <== eq[28][i].out;
+		multi_or[4][i].in[5] <== eq[29][i].out;
+		multi_or[4][i].in[6] <== eq[30][i].out;
+		multi_or[4][i].in[7] <== eq[31][i].out;
+		multi_or[4][i].in[8] <== eq[32][i].out;
+		multi_or[4][i].in[9] <== eq[33][i].out;
+		and[12][i].b <== multi_or[4][i].out;
+		lt[10][i] = LessEqThan(8);
+		lt[10][i].in[0] <== 128;
+		lt[10][i].in[1] <== in[i];
+		lt[11][i] = LessEqThan(8);
+		lt[11][i].in[0] <== in[i];
+		lt[11][i].in[1] <== 191;
+		and[13][i] = AND();
+		and[13][i].a <== lt[10][i].out;
+		and[13][i].b <== lt[11][i].out;
+		and[14][i] = AND();
+		and[14][i].a <== states[i][6];
+		and[14][i].b <== and[13][i].out;
+		multi_or[5][i] = MultiOR(3);
+		multi_or[5][i].in[0] <== and[10][i].out;
+		multi_or[5][i].in[1] <== and[12][i].out;
+		multi_or[5][i].in[2] <== and[14][i].out;
+		states[i+1][5] <== multi_or[5][i].out;
+		lt[12][i] = LessEqThan(8);
+		lt[12][i].in[0] <== 194;
+		lt[12][i].in[1] <== in[i];
+		lt[13][i] = LessEqThan(8);
+		lt[13][i].in[0] <== in[i];
+		lt[13][i].in[1] <== 223;
+		and[15][i] = AND();
+		and[15][i].a <== lt[12][i].out;
+		and[15][i].b <== lt[13][i].out;
+		and[16][i] = AND();
+		and[16][i].a <== states[i][5];
+		and[16][i].b <== and[15][i].out;
+		lt[14][i] = LessEqThan(8);
+		lt[14][i].in[0] <== 160;
+		lt[14][i].in[1] <== in[i];
+		lt[15][i] = LessEqThan(8);
+		lt[15][i].in[0] <== in[i];
+		lt[15][i].in[1] <== 191;
+		and[17][i] = AND();
+		and[17][i].a <== lt[14][i].out;
+		and[17][i].b <== lt[15][i].out;
+		and[18][i] = AND();
+		and[18][i].a <== states[i][7];
+		and[18][i].b <== and[17][i].out;
+		and[19][i] = AND();
+		and[19][i].a <== states[i][8];
+		and[19][i].b <== and[13][i].out;
+		lt[16][i] = LessEqThan(8);
+		lt[16][i].in[0] <== 128;
+		lt[16][i].in[1] <== in[i];
+		lt[17][i] = LessEqThan(8);
+		lt[17][i].in[0] <== in[i];
+		lt[17][i].in[1] <== 159;
+		and[20][i] = AND();
+		and[20][i].a <== lt[16][i].out;
+		and[20][i].b <== lt[17][i].out;
+		and[21][i] = AND();
+		and[21][i].a <== states[i][9];
+		and[21][i].b <== and[20][i].out;
+		multi_or[6][i] = MultiOR(4);
+		multi_or[6][i].in[0] <== and[16][i].out;
+		multi_or[6][i].in[1] <== and[18][i].out;
+		multi_or[6][i].in[2] <== and[19][i].out;
+		multi_or[6][i].in[3] <== and[21][i].out;
+		states[i+1][6] <== multi_or[6][i].out;
+		eq[34][i] = IsEqual();
+		eq[34][i].in[0] <== in[i];
+		eq[34][i].in[1] <== 224;
+		and[22][i] = AND();
+		and[22][i].a <== states[i][5];
+		and[22][i].b <== eq[34][i].out;
+		states[i+1][7] <== and[22][i].out;
+		eq[35][i] = IsEqual();
+		eq[35][i].in[0] <== in[i];
+		eq[35][i].in[1] <== 225;
+		eq[36][i] = IsEqual();
+		eq[36][i].in[0] <== in[i];
+		eq[36][i].in[1] <== 226;
+		eq[37][i] = IsEqual();
+		eq[37][i].in[0] <== in[i];
+		eq[37][i].in[1] <== 227;
+		eq[38][i] = IsEqual();
+		eq[38][i].in[0] <== in[i];
+		eq[38][i].in[1] <== 228;
+		eq[39][i] = IsEqual();
+		eq[39][i].in[0] <== in[i];
+		eq[39][i].in[1] <== 229;
+		eq[40][i] = IsEqual();
+		eq[40][i].in[0] <== in[i];
+		eq[40][i].in[1] <== 230;
+		eq[41][i] = IsEqual();
+		eq[41][i].in[0] <== in[i];
+		eq[41][i].in[1] <== 231;
+		eq[42][i] = IsEqual();
+		eq[42][i].in[0] <== in[i];
+		eq[42][i].in[1] <== 232;
+		eq[43][i] = IsEqual();
+		eq[43][i].in[0] <== in[i];
+		eq[43][i].in[1] <== 233;
+		eq[44][i] = IsEqual();
+		eq[44][i].in[0] <== in[i];
+		eq[44][i].in[1] <== 234;
+		eq[45][i] = IsEqual();
+		eq[45][i].in[0] <== in[i];
+		eq[45][i].in[1] <== 235;
+		eq[46][i] = IsEqual();
+		eq[46][i].in[0] <== in[i];
+		eq[46][i].in[1] <== 236;
+		eq[47][i] = IsEqual();
+		eq[47][i].in[0] <== in[i];
+		eq[47][i].in[1] <== 238;
+		eq[48][i] = IsEqual();
+		eq[48][i].in[0] <== in[i];
+		eq[48][i].in[1] <== 239;
+		and[23][i] = AND();
+		and[23][i].a <== states[i][5];
+		multi_or[7][i] = MultiOR(14);
+		multi_or[7][i].in[0] <== eq[35][i].out;
+		multi_or[7][i].in[1] <== eq[36][i].out;
+		multi_or[7][i].in[2] <== eq[37][i].out;
+		multi_or[7][i].in[3] <== eq[38][i].out;
+		multi_or[7][i].in[4] <== eq[39][i].out;
+		multi_or[7][i].in[5] <== eq[40][i].out;
+		multi_or[7][i].in[6] <== eq[41][i].out;
+		multi_or[7][i].in[7] <== eq[42][i].out;
+		multi_or[7][i].in[8] <== eq[43][i].out;
+		multi_or[7][i].in[9] <== eq[44][i].out;
+		multi_or[7][i].in[10] <== eq[45][i].out;
+		multi_or[7][i].in[11] <== eq[46][i].out;
+		multi_or[7][i].in[12] <== eq[47][i].out;
+		multi_or[7][i].in[13] <== eq[48][i].out;
+		and[23][i].b <== multi_or[7][i].out;
+		lt[18][i] = LessEqThan(8);
+		lt[18][i].in[0] <== 144;
+		lt[18][i].in[1] <== in[i];
+		lt[19][i] = LessEqThan(8);
+		lt[19][i].in[0] <== in[i];
+		lt[19][i].in[1] <== 191;
+		and[24][i] = AND();
+		and[24][i].a <== lt[18][i].out;
+		and[24][i].b <== lt[19][i].out;
+		and[25][i] = AND();
+		and[25][i].a <== states[i][10];
+		and[25][i].b <== and[24][i].out;
+		and[26][i] = AND();
+		and[26][i].a <== states[i][11];
+		and[26][i].b <== and[13][i].out;
+		eq[49][i] = IsEqual();
+		eq[49][i].in[0] <== in[i];
+		eq[49][i].in[1] <== 128;
+		eq[50][i] = IsEqual();
+		eq[50][i].in[0] <== in[i];
+		eq[50][i].in[1] <== 129;
+		eq[51][i] = IsEqual();
+		eq[51][i].in[0] <== in[i];
+		eq[51][i].in[1] <== 130;
+		eq[52][i] = IsEqual();
+		eq[52][i].in[0] <== in[i];
+		eq[52][i].in[1] <== 131;
+		eq[53][i] = IsEqual();
+		eq[53][i].in[0] <== in[i];
+		eq[53][i].in[1] <== 132;
+		eq[54][i] = IsEqual();
+		eq[54][i].in[0] <== in[i];
+		eq[54][i].in[1] <== 133;
+		eq[55][i] = IsEqual();
+		eq[55][i].in[0] <== in[i];
+		eq[55][i].in[1] <== 134;
+		eq[56][i] = IsEqual();
+		eq[56][i].in[0] <== in[i];
+		eq[56][i].in[1] <== 135;
+		eq[57][i] = IsEqual();
+		eq[57][i].in[0] <== in[i];
+		eq[57][i].in[1] <== 136;
+		eq[58][i] = IsEqual();
+		eq[58][i].in[0] <== in[i];
+		eq[58][i].in[1] <== 137;
+		eq[59][i] = IsEqual();
+		eq[59][i].in[0] <== in[i];
+		eq[59][i].in[1] <== 138;
+		eq[60][i] = IsEqual();
+		eq[60][i].in[0] <== in[i];
+		eq[60][i].in[1] <== 139;
+		eq[61][i] = IsEqual();
+		eq[61][i].in[0] <== in[i];
+		eq[61][i].in[1] <== 140;
+		eq[62][i] = IsEqual();
+		eq[62][i].in[0] <== in[i];
+		eq[62][i].in[1] <== 141;
+		eq[63][i] = IsEqual();
+		eq[63][i].in[0] <== in[i];
+		eq[63][i].in[1] <== 142;
+		eq[64][i] = IsEqual();
+		eq[64][i].in[0] <== in[i];
+		eq[64][i].in[1] <== 143;
+		and[27][i] = AND();
+		and[27][i].a <== states[i][12];
+		multi_or[8][i] = MultiOR(16);
+		multi_or[8][i].in[0] <== eq[49][i].out;
+		multi_or[8][i].in[1] <== eq[50][i].out;
+		multi_or[8][i].in[2] <== eq[51][i].out;
+		multi_or[8][i].in[3] <== eq[52][i].out;
+		multi_or[8][i].in[4] <== eq[53][i].out;
+		multi_or[8][i].in[5] <== eq[54][i].out;
+		multi_or[8][i].in[6] <== eq[55][i].out;
+		multi_or[8][i].in[7] <== eq[56][i].out;
+		multi_or[8][i].in[8] <== eq[57][i].out;
+		multi_or[8][i].in[9] <== eq[58][i].out;
+		multi_or[8][i].in[10] <== eq[59][i].out;
+		multi_or[8][i].in[11] <== eq[60][i].out;
+		multi_or[8][i].in[12] <== eq[61][i].out;
+		multi_or[8][i].in[13] <== eq[62][i].out;
+		multi_or[8][i].in[14] <== eq[63][i].out;
+		multi_or[8][i].in[15] <== eq[64][i].out;
+		and[27][i].b <== multi_or[8][i].out;
+		multi_or[9][i] = MultiOR(4);
+		multi_or[9][i].in[0] <== and[23][i].out;
+		multi_or[9][i].in[1] <== and[25][i].out;
+		multi_or[9][i].in[2] <== and[26][i].out;
+		multi_or[9][i].in[3] <== and[27][i].out;
+		states[i+1][8] <== multi_or[9][i].out;
+		eq[65][i] = IsEqual();
+		eq[65][i].in[0] <== in[i];
+		eq[65][i].in[1] <== 237;
+		and[28][i] = AND();
+		and[28][i].a <== states[i][5];
+		and[28][i].b <== eq[65][i].out;
+		states[i+1][9] <== and[28][i].out;
+		eq[66][i] = IsEqual();
+		eq[66][i].in[0] <== in[i];
+		eq[66][i].in[1] <== 240;
+		and[29][i] = AND();
+		and[29][i].a <== states[i][5];
+		and[29][i].b <== eq[66][i].out;
+		states[i+1][10] <== and[29][i].out;
+		eq[67][i] = IsEqual();
+		eq[67][i].in[0] <== in[i];
+		eq[67][i].in[1] <== 241;
+		eq[68][i] = IsEqual();
+		eq[68][i].in[0] <== in[i];
+		eq[68][i].in[1] <== 242;
+		eq[69][i] = IsEqual();
+		eq[69][i].in[0] <== in[i];
+		eq[69][i].in[1] <== 243;
+		and[30][i] = AND();
+		and[30][i].a <== states[i][5];
+		multi_or[10][i] = MultiOR(3);
+		multi_or[10][i].in[0] <== eq[67][i].out;
+		multi_or[10][i].in[1] <== eq[68][i].out;
+		multi_or[10][i].in[2] <== eq[69][i].out;
+		and[30][i].b <== multi_or[10][i].out;
+		states[i+1][11] <== and[30][i].out;
+		eq[70][i] = IsEqual();
+		eq[70][i].in[0] <== in[i];
+		eq[70][i].in[1] <== 244;
+		and[31][i] = AND();
+		and[31][i].a <== states[i][5];
+		and[31][i].b <== eq[70][i].out;
+		states[i+1][12] <== and[31][i].out;
+		from_zero_enabled[i] <== MultiNOR(12)([states_tmp[i+1][1], states[i+1][2], states[i+1][3], states[i+1][4], states[i+1][5], states[i+1][6], states[i+1][7], states[i+1][8], states[i+1][9], states[i+1][10], states[i+1][11], states[i+1][12]]);
+		states[i+1][1] <== MultiOR(2)([states_tmp[i+1][1], from_zero_enabled[i] * and[0][i].out]);
+		state_changed[i].in[0] <== states[i+1][1];
+		state_changed[i].in[1] <== states[i+1][2];
+		state_changed[i].in[2] <== states[i+1][3];
+		state_changed[i].in[3] <== states[i+1][4];
+		state_changed[i].in[4] <== states[i+1][5];
+		state_changed[i].in[5] <== states[i+1][6];
+		state_changed[i].in[6] <== states[i+1][7];
+		state_changed[i].in[7] <== states[i+1][8];
+		state_changed[i].in[8] <== states[i+1][9];
+		state_changed[i].in[9] <== states[i+1][10];
+		state_changed[i].in[10] <== states[i+1][11];
+		state_changed[i].in[11] <== states[i+1][12];
+	}
+
+	component is_accepted = MultiOR(num_bytes+1);
+	for (var i = 0; i <= num_bytes; i++) {
+		is_accepted.in[i] <== states[i][5];
+	}
+	out <== is_accepted.out;
+	signal is_consecutive[msg_bytes+1][3];
+	is_consecutive[msg_bytes][2] <== 0;
+	for (var i = 0; i < msg_bytes; i++) {
+		is_consecutive[msg_bytes-1-i][0] <== states[num_bytes-i][5] * (1 - is_consecutive[msg_bytes-i][2]) + is_consecutive[msg_bytes-i][2];
+		is_consecutive[msg_bytes-1-i][1] <== state_changed[msg_bytes-i].out * is_consecutive[msg_bytes-1-i][0];
+		is_consecutive[msg_bytes-1-i][2] <== ORAnd()([(1 - from_zero_enabled[msg_bytes-i+1]), states[num_bytes-i][5], is_consecutive[msg_bytes-1-i][1]]);
+	}
+	// substrings calculated: [{(1, 2), (2, 2), (2, 3), (3, 4), (4, 4)}]
+	signal prev_states0[5][msg_bytes];
+	signal is_substr0[msg_bytes];
+	signal is_reveal0[msg_bytes];
+	signal output reveal0[msg_bytes];
+	for (var i = 0; i < msg_bytes; i++) {
+		 // the 0-th substring transitions: [(1, 2), (2, 2), (2, 3), (3, 4), (4, 4)]
+		prev_states0[0][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][1];
+		prev_states0[1][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][2];
+		prev_states0[2][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][2];
+		prev_states0[3][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][3];
+		prev_states0[4][i] <== (1 - from_zero_enabled[i+1]) * states[i+1][4];
+		is_substr0[i] <== MultiOR(5)([prev_states0[0][i] * states[i+2][2], prev_states0[1][i] * states[i+2][2], prev_states0[2][i] * states[i+2][3], prev_states0[3][i] * states[i+2][4], prev_states0[4][i] * states[i+2][4]]);
+		is_reveal0[i] <== MultiAND(3)([out, is_substr0[i], is_consecutive[i][2]]);
+		reveal0[i] <== in[i+1] * is_reveal0[i];
+	}
+}
\ No newline at end of file
diff --git a/packages/circom/tests/from_addr.test.js b/packages/circom/tests/from_addr.test.js
index dba8b0a..ac9c50f 100644
--- a/packages/circom/tests/from_addr.test.js
+++ b/packages/circom/tests/from_addr.test.js
@@ -28,17 +28,17 @@ describe("From Addr Regex", () => {
     }
     {
       const email_addr_json = readFileSync(
-        path.join(__dirname, "../circuits/common/email_addr_with_name.json"),
+        path.join(__dirname, "../circuits/common/reversed_email_addr_with_name.json"),
         "utf8"
       );
       const circom = compiler.genFromDecomposed(
         email_addr_json,
-        "EmailAddrWithNameRegex"
+        "ReversedEmailAddrWithNameRegex"
       );
       writeFileSync(
         path.join(
           __dirname,
-          "../circuits/common/email_addr_with_name_regex.circom"
+          "../circuits/common/reversed_email_addr_with_name_regex.circom"
         ),
         circom
       );
@@ -268,4 +268,94 @@ describe("From Addr Regex", () => {
     }
   });
 
+  it("from field with double <> 1", async () => {
+    const fromStr = "from:\"Some name <victim@any-domain>\" <attacker@outlook.com>\r\n";
+    const paddedStr = apis.padString(fromStr, 1024);
+    const circuitInputs = {
+      msg: paddedStr,
+    };
+    const witness = await circuit.calculateWitness(circuitInputs);
+    await circuit.checkConstraints(witness);
+    expect(1n).toEqual(witness[1]);
+    const prefixIdxes = apis.extractFromAddrIdxes(fromStr)[0];
+    expect("attacker@outlook.com").toEqual(fromStr.slice(prefixIdxes[0], prefixIdxes[1]));
+    for (let idx = 0; idx < 1024; ++idx) {
+      if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
+        expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
+      } else {
+        expect(0n).toEqual(witness[2 + idx]);
+      }
+    }
+  });
+
+
+  it("from field with double <> 2", async () => {
+    const fromStr = "from:\"Some name <victim@any-domain>\" < attacker@outlook.com>\r\n";
+    const paddedStr = apis.padString(fromStr, 1024);
+    const circuitInputs = {
+      msg: paddedStr,
+    };
+    const witness = await circuit.calculateWitness(circuitInputs);
+    await circuit.checkConstraints(witness);
+    console.log((witness[1]));
+    expect(1n).toEqual(witness[1]);
+    const prefixIdxes = apis.extractFromAddrIdxes(fromStr)[0];
+    expect(" attacker@outlook.com").toEqual(fromStr.slice(prefixIdxes[0], prefixIdxes[1]));
+    for (let idx = 0; idx < 1024; ++idx) {
+      if (witness[2 + idx] !== 0n) {
+        console.log('idx:', idx, 'witness:', witness[2 + idx]);
+      }
+      // if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
+      //   expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
+      // } else {
+      //   expect(0n).toEqual(witness[2 + idx]);
+      // }
+    }
+  });
+
+
+  it("from field with double <> 3", async () => {
+    const fromStr = "from:\"Some name <victim@any-domain>\" <attacker@outlook.com >\r\n";
+    const paddedStr = apis.padString(fromStr, 1024);
+    const circuitInputs = {
+      msg: paddedStr,
+    };
+    const witness = await circuit.calculateWitness(circuitInputs);
+    await circuit.checkConstraints(witness);
+    console.log((witness[1]));
+    expect(1n).toEqual(witness[1]);
+    const prefixIdxes = apis.extractFromAddrIdxes(fromStr)[0];
+    expect("attacker@outlook.com ").toEqual(fromStr.slice(prefixIdxes[0], prefixIdxes[1]));
+    for (let idx = 0; idx < 1024; ++idx) {
+      if (witness[2 + idx] !== 0n) {
+        console.log('idx:', idx, 'witness:', witness[2 + idx]);
+      }
+      // if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
+      //   expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
+      // } else {
+      //   expect(0n).toEqual(witness[2 + idx]);
+      // }
+    }
+  });
+
+  it("from field with triple <>", async () => {
+    const fromStr = "from:\"Some name <victim1@any-domain<victim1@any-domain>>\" <attacker@outlook.com>\r\n";
+    const paddedStr = apis.padString(fromStr, 1024);
+    const circuitInputs = {
+      msg: paddedStr,
+    };
+    const witness = await circuit.calculateWitness(circuitInputs);
+    await circuit.checkConstraints(witness);
+    expect(1n).toEqual(witness[1]);
+    const prefixIdxes = apis.extractFromAddrIdxes(fromStr)[0];
+    expect("attacker@outlook.com").toEqual(fromStr.slice(prefixIdxes[0], prefixIdxes[1]));
+    for (let idx = 0; idx < 1024; ++idx) {
+      if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
+        expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
+      } else {
+        expect(0n).toEqual(witness[2 + idx]);
+      }
+    }
+  });
+
 });
diff --git a/packages/circom/tests/to_addr.test.js b/packages/circom/tests/to_addr.test.js
index f6b3a62..e03ffe2 100644
--- a/packages/circom/tests/to_addr.test.js
+++ b/packages/circom/tests/to_addr.test.js
@@ -28,17 +28,17 @@ describe("To Addr Regex", () => {
     }
     {
       const email_addr_json = readFileSync(
-        path.join(__dirname, "../circuits/common/email_addr_with_name.json"),
+        path.join(__dirname, "../circuits/common/reversed_email_addr_with_name.json"),
         "utf8"
       );
       const circom = compiler.genFromDecomposed(
         email_addr_json,
-        "EmailAddrWithNameRegex"
+        "ReversedEmailAddrWithNameRegex"
       );
       writeFileSync(
         path.join(
           __dirname,
-          "../circuits/common/email_addr_with_name_regex.circom"
+          "../circuits/common/reversed_email_addr_with_name_regex.circom"
         ),
         circom
       );
@@ -266,4 +266,94 @@ describe("To Addr Regex", () => {
       }
     }
   });
+
+  it("to field with double <> 1", async () => {
+    const toStr = "to:\"Some name <victim@any-domain>\" <attacker@outlook.com>\r\n";
+    const paddedStr = apis.padString(toStr, 1024);
+    const circuitInputs = {
+      msg: paddedStr,
+    };
+    const witness = await circuit.calculateWitness(circuitInputs);
+    await circuit.checkConstraints(witness);
+    expect(1n).toEqual(witness[1]);
+    const prefixIdxes = apis.extractToAddrIdxes(toStr)[0];
+    expect("attacker@outlook.com").toEqual(toStr.slice(prefixIdxes[0], prefixIdxes[1]));
+    for (let idx = 0; idx < 1024; ++idx) {
+      if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
+        expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
+      } else {
+        expect(0n).toEqual(witness[2 + idx]);
+      }
+    }
+  });
+
+
+  it("to field with double <> 2", async () => {
+    const toStr = "to:\"Some name <victim@any-domain>\" < attacker@outlook.com>\r\n";
+    const paddedStr = apis.padString(toStr, 1024);
+    const circuitInputs = {
+      msg: paddedStr,
+    };
+    const witness = await circuit.calculateWitness(circuitInputs);
+    await circuit.checkConstraints(witness);
+    console.log((witness[1]));
+    expect(1n).toEqual(witness[1]);
+    const prefixIdxes = apis.extractToAddrIdxes(toStr)[0];
+    expect(" attacker@outlook.com").toEqual(toStr.slice(prefixIdxes[0], prefixIdxes[1]));
+    for (let idx = 0; idx < 1024; ++idx) {
+      if (witness[2 + idx] !== 0n) {
+        console.log('idx:', idx, 'witness:', witness[2 + idx]);
+      }
+      // if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
+      //   expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
+      // } else {
+      //   expect(0n).toEqual(witness[2 + idx]);
+      // }
+    }
+  });
+
+
+  it("to field with double <> 3", async () => {
+    const toStr = "to:\"Some name <victim@any-domain>\" <attacker@outlook.com >\r\n";
+    const paddedStr = apis.padString(toStr, 1024);
+    const circuitInputs = {
+      msg: paddedStr,
+    };
+    const witness = await circuit.calculateWitness(circuitInputs);
+    await circuit.checkConstraints(witness);
+    console.log((witness[1]));
+    expect(1n).toEqual(witness[1]);
+    const prefixIdxes = apis.extractToAddrIdxes(toStr)[0];
+    expect("attacker@outlook.com ").toEqual(toStr.slice(prefixIdxes[0], prefixIdxes[1]));
+    for (let idx = 0; idx < 1024; ++idx) {
+      if (witness[2 + idx] !== 0n) {
+        console.log('idx:', idx, 'witness:', witness[2 + idx]);
+      }
+      // if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
+      //   expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
+      // } else {
+      //   expect(0n).toEqual(witness[2 + idx]);
+      // }
+    }
+  });
+
+  it("to field with triple <>", async () => {
+    const toStr = "to:\"Some name <victim1@any-domain<victim1@any-domain>>\" <attacker@outlook.com>\r\n";
+    const paddedStr = apis.padString(toStr, 1024);
+    const circuitInputs = {
+      msg: paddedStr,
+    };
+    const witness = await circuit.calculateWitness(circuitInputs);
+    await circuit.checkConstraints(witness);
+    expect(1n).toEqual(witness[1]);
+    const prefixIdxes = apis.extractToAddrIdxes(toStr)[0];
+    expect("attacker@outlook.com").toEqual(toStr.slice(prefixIdxes[0], prefixIdxes[1]));
+    for (let idx = 0; idx < 1024; ++idx) {
+      if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
+        expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
+      } else {
+        expect(0n).toEqual(witness[2 + idx]);
+      }
+    }
+  });
 });