diff --git a/src/json_movelist/azucena.json b/src/json_movelist/azucena.json
index 704b43f..2d0c54d 100644
--- a/src/json_movelist/azucena.json
+++ b/src/json_movelist/azucena.json
@@ -112,32 +112,32 @@
         "target": "h,h"
     },
     {
-        "damage": "",
+        "damage": "-",
         "gif": "",
         "id": "Azucena-1+2+3+4",
         "input": "1+2+3+4",
         "name": "Ki Charge",
-        "notes": "\n* Cannot block for 5 seconds\n* CH state for 5 seconds",
+        "notes": "Shift to charging",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
-        "recovery": "r72",
+        "recovery": "",
         "startup": "",
-        "target": ""
+        "target": "sp"
     },
     {
-        "damage": "-",
+        "damage": "",
         "gif": "",
         "id": "Azucena-1+2+3+4",
         "input": "1+2+3+4",
         "name": "Ki Charge",
-        "notes": "Shift to charging",
+        "notes": "\n* Cannot block for 5 seconds\n* CH state for 5 seconds",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
-        "recovery": "",
+        "recovery": "r72",
         "startup": "",
-        "target": "sp"
+        "target": ""
     },
     {
         "damage": "54",
@@ -154,7 +154,7 @@
         "target": "sp,ub(m)"
     },
     {
-        "damage": "54",
+        "damage": "-54",
         "gif": "",
         "id": "Azucena-1+2+3+4,3+4",
         "input": "1+2+3+4,3+4",
@@ -165,7 +165,7 @@
         "on_hit": "-8",
         "recovery": "r57",
         "startup": "i75",
-        "target": "m!"
+        "target": "spm!"
     },
     {
         "damage": "5,23",
@@ -196,7 +196,7 @@
         "target": "t"
     },
     {
-        "damage": "",
+        "damage": "-",
         "gif": "",
         "id": "Azucena-1+3+4",
         "input": "1+3+4",
@@ -205,12 +205,12 @@
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
-        "recovery": "r55",
+        "recovery": "",
         "startup": "",
-        "target": ""
+        "target": "sp"
     },
     {
-        "damage": "-",
+        "damage": "",
         "gif": "",
         "id": "Azucena-1+3+4",
         "input": "1+3+4",
@@ -219,9 +219,9 @@
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
-        "recovery": "",
+        "recovery": "r55",
         "startup": "",
-        "target": "sp"
+        "target": ""
     },
     {
         "damage": "",
@@ -356,12 +356,12 @@
         "input": "2+3+4",
         "name": "Coffee Break",
         "notes": "",
-        "on_block": "-1",
-        "on_ch": "-1",
+        "on_block": "",
+        "on_ch": "",
         "on_hit": "-1",
-        "recovery": "",
-        "startup": "",
-        "target": "ub(h)"
+        "recovery": "r51",
+        "startup": "i45",
+        "target": "h!"
     },
     {
         "damage": "0",
@@ -370,12 +370,12 @@
         "input": "2+3+4",
         "name": "Coffee Break",
         "notes": "",
-        "on_block": "",
-        "on_ch": "",
+        "on_block": "-1",
+        "on_ch": "-1",
         "on_hit": "-1",
-        "recovery": "r51",
-        "startup": "i45",
-        "target": "h!"
+        "recovery": "",
+        "startup": "",
+        "target": "ub(h)"
     },
     {
         "damage": "-",
@@ -453,12 +453,12 @@
         "id": "Azucena-3,2",
         "input": "3,2",
         "name": "Groovy Strike",
-        "notes": "",
-        "on_block": "-12",
-        "on_ch": "KDN+25",
-        "on_hit": "+6",
-        "recovery": "",
-        "startup": "(1)",
+        "notes": "\n* Combo from 1st hit with 5f delay\n* Input can be delayed 10f delay",
+        "on_block": "-12~-11",
+        "on_ch": "+33d (+25)",
+        "on_hit": "+6~+7",
+        "recovery": "r31",
+        "startup": ",i23~24",
         "target": "m,m"
     },
     {
@@ -467,12 +467,12 @@
         "id": "Azucena-3,2",
         "input": "3,2",
         "name": "Groovy Strike",
-        "notes": "\n* Combo from 1st hit with 5f delay\n* Input can be delayed 10f delay",
-        "on_block": "-12~-11",
-        "on_ch": "+33d (+25)",
-        "on_hit": "+6~+7",
-        "recovery": "r31",
-        "startup": ",i23~24",
+        "notes": "",
+        "on_block": "-12",
+        "on_ch": "KDN+25",
+        "on_hit": "+6",
+        "recovery": "",
+        "startup": "(1)",
         "target": "m,m"
     },
     {
@@ -559,20 +559,6 @@
         "startup": "12f(1)",
         "target": "h,sp"
     },
-    {
-        "damage": "15,11",
-        "gif": "",
-        "id": "Azucena-4,1",
-        "input": "4,1",
-        "name": "Guapuo to BT",
-        "notes": "",
-        "on_block": "-2",
-        "on_ch": "+6",
-        "on_hit": "+4",
-        "recovery": "",
-        "startup": "(1)",
-        "target": "h,h,sp"
-    },
     {
         "damage": "15,11",
         "gif": "",
@@ -588,18 +574,18 @@
         "target": "h,h"
     },
     {
-        "damage": "15,17",
+        "damage": "15,11",
         "gif": "",
-        "id": "Azucena-4,3",
-        "input": "4,3",
-        "name": "Delfin Patadas",
-        "notes": "\n* Balcony Break on CH\n* Combo from 1st CH with 8f delay\n* Input can be delayed 12f",
-        "on_block": "-11~-10",
-        "on_ch": "+37a",
-        "on_hit": "+19c~+20c",
-        "recovery": "r30",
-        "startup": ",i26~27",
-        "target": "h,M"
+        "id": "Azucena-4,1",
+        "input": "4,1",
+        "name": "Guapuo to BT",
+        "notes": "",
+        "on_block": "-2",
+        "on_ch": "+6",
+        "on_hit": "+4",
+        "recovery": "",
+        "startup": "(1)",
+        "target": "h,h,sp"
     },
     {
         "damage": "15,17",
@@ -615,6 +601,20 @@
         "startup": "(1)",
         "target": "h,m"
     },
+    {
+        "damage": "15,17",
+        "gif": "",
+        "id": "Azucena-4,3",
+        "input": "4,3",
+        "name": "Delfin Patadas",
+        "notes": "\n* Balcony Break on CH\n* Combo from 1st CH with 8f delay\n* Input can be delayed 12f",
+        "on_block": "-11~-10",
+        "on_ch": "+37a",
+        "on_hit": "+19c~+20c",
+        "recovery": "r30",
+        "startup": ",i26~27",
+        "target": "h,M"
+    },
     {
         "damage": "14",
         "gif": "",
@@ -1773,7 +1773,7 @@
         "on_block": "-5",
         "on_ch": "",
         "on_hit": "+6",
-        "recovery": "r24",
+        "recovery": "r24 FC",
         "startup": "i10",
         "target": "sl"
     },
@@ -1829,7 +1829,7 @@
         "on_block": "-4",
         "on_ch": "",
         "on_hit": "+7",
-        "recovery": "r23",
+        "recovery": "r23 FC",
         "startup": "i11",
         "target": "sl"
     },
@@ -1993,7 +1993,7 @@
         "id": "Azucena-df+1,4",
         "input": "df+1,4",
         "name": "",
-        "notes": "\n*Jail from 1st attack with 1f delay\n*Combo from 1st hit with 8f delay",
+        "notes": "\n* Combo from 1st hit with 8f delay\n* Jail from 1st block with 1f delay",
         "on_block": "-7~-6",
         "on_ch": "",
         "on_hit": "+4~+5",
@@ -2917,7 +2917,7 @@
         "id": "Azucena-f,f,F+3,2",
         "input": "f,f,F+3,2",
         "name": "Espresso Agresin",
-        "notes": "\n* \nBalcony break\n* Jail from 1st attack\n* Combo from 1st hit\n* Chip damage on block",
+        "notes": "\n* \nBalcony break\n* Jail from 1st attack\n* Chip damage on block",
         "on_block": "+5~+7",
         "on_ch": "",
         "on_hit": "+28a (+2)",
@@ -3056,28 +3056,28 @@
         "gif": "",
         "id": "Azucena-Heat,2+3,or,R1",
         "input": "Heat,2+3,or,R1",
-        "name": "Azucena Specialty (2nd hit)",
+        "name": "Azucena Specialty (3rd hit) to LD",
         "notes": "",
         "on_block": "",
-        "on_ch": "KDN",
-        "on_hit": "KDN",
+        "on_ch": "KDN+15",
+        "on_hit": "KDN+15",
         "recovery": "",
         "startup": "",
-        "target": "m,h,h"
+        "target": "m,h,m,sp"
     },
     {
         "damage": "15,15,30",
         "gif": "",
         "id": "Azucena-Heat,2+3,or,R1",
         "input": "Heat,2+3,or,R1",
-        "name": "Azucena Specialty (3rd hit) to LD",
+        "name": "Azucena Specialty (2nd hit)",
         "notes": "",
         "on_block": "",
-        "on_ch": "KDN+15",
-        "on_hit": "KDN+15",
+        "on_ch": "KDN",
+        "on_hit": "KDN",
         "recovery": "",
         "startup": "",
-        "target": "m,h,m,sp"
+        "target": "m,h,h"
     },
     {
         "damage": "15,38(4,4,9)",
diff --git a/src/json_movelist/jun.json b/src/json_movelist/jun.json
index 8a19164..ee82426 100644
--- a/src/json_movelist/jun.json
+++ b/src/json_movelist/jun.json
@@ -145,7 +145,7 @@
         "id": "Jun-1,2",
         "input": "1,2",
         "name": "Spear Step",
-        "notes": "\n* Combo from 1st hit\n* Jail from 1st attack",
+        "notes": "\n* Jail from 1st attack",
         "on_block": "-3",
         "on_ch": "",
         "on_hit": "+6",
@@ -397,7 +397,7 @@
         "id": "Jun-1+4",
         "input": "1+4",
         "name": "",
-        "notes": "\n* Combo from 1st hit\n* Jail from 1st attack\n* CH advantage listed is for the 2nd hit",
+        "notes": "\n* Jail from 1st attack\n* CH advantage listed is for the 2nd hit",
         "on_block": "-3",
         "on_ch": "+4",
         "on_hit": "-3",
@@ -929,12 +929,12 @@
         "id": "Jun-3",
         "input": "3",
         "name": "Shion",
-        "notes": "New Move",
-        "on_block": "",
+        "notes": "Balcony break",
+        "on_block": "-13~-12",
         "on_ch": "",
-        "on_hit": "KDN",
-        "recovery": "",
-        "startup": "14f",
+        "on_hit": "+18a (+1)",
+        "recovery": "r26",
+        "startup": ",i14~15",
         "target": "m"
     },
     {
@@ -943,12 +943,12 @@
         "id": "Jun-3",
         "input": "3",
         "name": "Shion",
-        "notes": "Balcony break",
-        "on_block": "-13~-12",
+        "notes": "New Move",
+        "on_block": "",
         "on_ch": "",
-        "on_hit": "+18a (+1)",
-        "recovery": "r26",
-        "startup": ",i14~15",
+        "on_hit": "KDN",
+        "recovery": "",
+        "startup": "14f",
         "target": "m"
     },
     {
@@ -1007,20 +1007,6 @@
         "startup": "",
         "target": "mm"
     },
-    {
-        "damage": "17",
-        "gif": "",
-        "id": "Jun-4",
-        "input": "4",
-        "name": "Magic Four",
-        "notes": "",
-        "on_block": "-9",
-        "on_ch": "+32a",
-        "on_hit": "+7",
-        "recovery": "r28",
-        "startup": "i12",
-        "target": "h"
-    },
     {
         "damage": "-",
         "gif": "",
@@ -1035,6 +1021,20 @@
         "startup": "",
         "target": "h"
     },
+    {
+        "damage": "17",
+        "gif": "",
+        "id": "Jun-4",
+        "input": "4",
+        "name": "Magic Four",
+        "notes": "",
+        "on_block": "-9",
+        "on_ch": "+32a",
+        "on_hit": "+7",
+        "recovery": "r28",
+        "startup": "i12",
+        "target": "h"
+    },
     {
         "damage": "19",
         "gif": "",
@@ -1540,29 +1540,29 @@
         "target": "m,M"
     },
     {
-        "damage": "20,22",
+        "damage": "-",
         "gif": "",
         "id": "Jun-b,3,2",
         "input": "b,3,2",
-        "name": "Ryuusha Renken",
-        "notes": "\n* Chip damage when guarded\n* Deals self-damage (recoverable) when not in Heat\n* New Move\n",
+        "name": "Dragon Wheel Kick Demon Slayer",
+        "notes": "",
         "on_block": "",
-        "on_ch": "",
-        "on_hit": "KDN",
+        "on_ch": "LNC",
+        "on_hit": "LNC",
         "recovery": "",
         "startup": "",
         "target": "m,m"
     },
     {
-        "damage": "-",
+        "damage": "20,22",
         "gif": "",
         "id": "Jun-b,3,2",
         "input": "b,3,2",
-        "name": "Dragon Wheel Kick Demon Slayer",
-        "notes": "",
+        "name": "Ryuusha Renken",
+        "notes": "\n* Chip damage when guarded\n* Deals self-damage (recoverable) when not in Heat\n* New Move\n",
         "on_block": "",
-        "on_ch": "LNC",
-        "on_hit": "LNC",
+        "on_ch": "",
+        "on_hit": "KDN",
         "recovery": "",
         "startup": "",
         "target": "m,m"
@@ -2394,31 +2394,31 @@
         "target": "m"
     },
     {
-        "damage": "14",
+        "damage": "-",
         "gif": "",
         "id": "Jun-df,2",
         "input": "df,2",
-        "name": "Mizuho",
-        "notes": "New Move",
+        "name": "REMOVED",
+        "notes": "",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "LNC",
+        "on_hit": "",
         "recovery": "",
-        "startup": "16f",
+        "startup": "",
         "target": "m"
     },
     {
-        "damage": "-",
+        "damage": "14",
         "gif": "",
         "id": "Jun-df,2",
         "input": "df,2",
-        "name": "REMOVED",
-        "notes": "",
+        "name": "Mizuho",
+        "notes": "New Move",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "",
+        "on_hit": "LNC",
         "recovery": "",
-        "startup": "",
+        "startup": "16f",
         "target": "m"
     },
     {
@@ -2618,31 +2618,31 @@
         "target": "m"
     },
     {
-        "damage": "22",
+        "damage": "-",
         "gif": "",
         "id": "Jun-df,4",
         "input": "df,4",
-        "name": "Katabami",
-        "notes": "\n* Command changed (→)\n* Tornade Move\n",
+        "name": "Front Kick",
+        "notes": "",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "KDN",
+        "on_hit": "",
         "recovery": "",
-        "startup": "15f",
+        "startup": "",
         "target": "m"
     },
     {
-        "damage": "-",
+        "damage": "22",
         "gif": "",
         "id": "Jun-df,4",
         "input": "df,4",
-        "name": "Front Kick",
-        "notes": "",
+        "name": "Katabami",
+        "notes": "\n* Command changed (→)\n* Tornade Move\n",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "",
+        "on_hit": "KDN",
         "recovery": "",
-        "startup": "",
+        "startup": "15f",
         "target": "m"
     },
     {
@@ -2730,31 +2730,31 @@
         "target": "h"
     },
     {
-        "damage": "-",
+        "damage": "0",
         "gif": "",
         "id": "Jun-f,1+2",
         "input": "f,1+2",
-        "name": "Izumo",
-        "notes": "",
+        "name": "Inner Peace",
+        "notes": "\n* Deals self-damage (recoverable) when not in Heat\n* On hit shift to Miare\n* New Move\n",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
         "recovery": "",
-        "startup": "",
+        "startup": "12f",
         "target": "h"
     },
     {
-        "damage": "0",
+        "damage": "-",
         "gif": "",
         "id": "Jun-f,1+2",
         "input": "f,1+2",
-        "name": "Inner Peace",
-        "notes": "\n* Deals self-damage (recoverable) when not in Heat\n* On hit shift to Miare\n* New Move\n",
+        "name": "Izumo",
+        "notes": "",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
         "recovery": "",
-        "startup": "12f",
+        "startup": "",
         "target": "h"
     },
     {
@@ -3752,32 +3752,32 @@
         "target": "l"
     },
     {
-        "damage": "16,32",
+        "damage": "-",
         "gif": "",
         "id": "Jun-Genjitsu ,2",
         "input": "Genjitsu ,2",
-        "name": "Kazama Style: Spirit",
-        "notes": "\n* Deals self-damage (recoverable) when not in Heat\n* absorb an attack to power up\n*  - Add chip damage when guarded\n* New Move\n",
+        "name": "REMOVED",
+        "notes": "",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "Th",
+        "on_hit": "",
         "recovery": "",
-        "startup": "17f",
-        "target": "m,th"
+        "startup": "",
+        "target": "m"
     },
     {
-        "damage": "-",
+        "damage": "16,32",
         "gif": "",
         "id": "Jun-Genjitsu ,2",
         "input": "Genjitsu ,2",
-        "name": "REMOVED",
-        "notes": "",
+        "name": "Kazama Style: Spirit",
+        "notes": "\n* Deals self-damage (recoverable) when not in Heat\n* absorb an attack to power up\n*  - Add chip damage when guarded\n* New Move\n",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "",
+        "on_hit": "Th",
         "recovery": "",
-        "startup": "",
-        "target": "m"
+        "startup": "17f",
+        "target": "m,th"
     },
     {
         "damage": "14",
@@ -4190,28 +4190,28 @@
         "gif": "",
         "id": "Jun-Izumo ,3",
         "input": "Izumo ,3",
-        "name": "Dragon Wheel Kick",
-        "notes": "",
+        "name": "Zuiun Renkyaku (Heat Engage)",
+        "notes": "New Move",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
         "recovery": "",
         "startup": "",
-        "target": "m"
+        "target": "m,m"
     },
     {
         "damage": "10,16",
         "gif": "",
         "id": "Jun-Izumo ,3",
         "input": "Izumo ,3",
-        "name": "Zuiun Renkyaku (Heat Engage)",
-        "notes": "New Move",
+        "name": "Dragon Wheel Kick",
+        "notes": "",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
         "recovery": "",
         "startup": "",
-        "target": "m,m"
+        "target": "m"
     },
     {
         "damage": "10,16",
@@ -4554,28 +4554,28 @@
         "gif": "",
         "id": "Jun-SS ,4",
         "input": "SS ,4",
-        "name": "Kagura (Heat Engage)",
-        "notes": "New Move",
+        "name": "Kagura",
+        "notes": "",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
         "recovery": "",
         "startup": "18f",
-        "target": "m,sp"
+        "target": "m"
     },
     {
         "damage": "20",
         "gif": "",
         "id": "Jun-SS ,4",
         "input": "SS ,4",
-        "name": "Kagura",
-        "notes": "",
+        "name": "Kagura (Heat Engage)",
+        "notes": "New Move",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
         "recovery": "",
         "startup": "18f",
-        "target": "m"
+        "target": "m,sp"
     },
     {
         "damage": "20",
@@ -4900,32 +4900,32 @@
         "target": "m,m,M"
     },
     {
-        "damage": "10,8,20",
+        "damage": "-",
         "gif": "",
         "id": "Jun-uf,4,3",
         "input": "uf,4,3",
-        "name": "Housenka - Misogi",
-        "notes": "\n* Deals self-damage (recoverable) when not in Heat\n* On hit shift to Miare\n* New Move\n",
+        "name": "Housenka",
+        "notes": "",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "KDN",
+        "on_hit": "",
         "recovery": "",
         "startup": "",
-        "target": "m,mm"
+        "target": "m,m"
     },
     {
-        "damage": "-",
+        "damage": "10,8,20",
         "gif": "",
         "id": "Jun-uf,4,3",
         "input": "uf,4,3",
-        "name": "Housenka",
-        "notes": "",
+        "name": "Housenka - Misogi",
+        "notes": "\n* Deals self-damage (recoverable) when not in Heat\n* On hit shift to Miare\n* New Move\n",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "",
+        "on_hit": "KDN",
         "recovery": "",
         "startup": "",
-        "target": "m,m"
+        "target": "m,mm"
     },
     {
         "damage": "-",
@@ -5404,31 +5404,31 @@
         "target": "m"
     },
     {
-        "damage": "-",
+        "damage": "21",
         "gif": "",
         "id": "Jun-WS ,4",
         "input": "WS ,4",
-        "name": "Toe Smash",
-        "notes": "",
+        "name": "Ichikaku",
+        "notes": "New Move",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "",
+        "on_hit": "KDN",
         "recovery": "",
-        "startup": "",
+        "startup": "11f",
         "target": "m"
     },
     {
-        "damage": "21",
+        "damage": "-",
         "gif": "",
         "id": "Jun-WS ,4",
         "input": "WS ,4",
-        "name": "Ichikaku",
-        "notes": "New Move",
+        "name": "Toe Smash",
+        "notes": "",
         "on_block": "",
         "on_ch": "",
-        "on_hit": "KDN",
+        "on_hit": "",
         "recovery": "",
-        "startup": "11f",
+        "startup": "",
         "target": "m"
     }
 ]
\ No newline at end of file
diff --git a/src/json_movelist/raven.json b/src/json_movelist/raven.json
index 16e7faf..d648f8c 100644
--- a/src/json_movelist/raven.json
+++ b/src/json_movelist/raven.json
@@ -4,13 +4,13 @@
         "gif": "",
         "id": "Raven-1",
         "input": "1",
-        "name": "Left Jab",
-        "notes": "Damage changed from 7 to 5",
+        "name": "Jab",
+        "notes": "",
         "on_block": "+1",
-        "on_ch": "+8",
+        "on_ch": "",
         "on_hit": "+8",
-        "recovery": "",
-        "startup": "10f",
+        "recovery": "r17",
+        "startup": "i10",
         "target": "h"
     },
     {
@@ -18,13 +18,13 @@
         "gif": "",
         "id": "Raven-1",
         "input": "1",
-        "name": "Jab",
-        "notes": "",
+        "name": "Left Jab",
+        "notes": "Damage changed from 7 to 5",
         "on_block": "+1",
-        "on_ch": "",
+        "on_ch": "+8",
         "on_hit": "+8",
-        "recovery": "r17",
-        "startup": "i10",
+        "recovery": "",
+        "startup": "10f",
         "target": "h"
     },
     {
@@ -60,13 +60,13 @@
         "gif": "",
         "id": "Raven-1+2",
         "input": "1+2",
-        "name": "Crusader",
-        "notes": "Heat Engager",
+        "name": "Crusader (Heat Engager)",
+        "notes": "\n* Absorbs Punch(H/M) during 1 to 3F\n* After absorbs succeeds, connect to Death from Above (During Haze )\n* New Move\n",
         "on_block": "-9",
-        "on_ch": "",
-        "on_hit": "+15a",
-        "recovery": "r33",
-        "startup": "i14",
+        "on_ch": "+17G",
+        "on_hit": "+17G",
+        "recovery": "",
+        "startup": "14f",
         "target": "m"
     },
     {
@@ -88,13 +88,13 @@
         "gif": "",
         "id": "Raven-1+2",
         "input": "1+2",
-        "name": "Crusader (Heat Engager)",
-        "notes": "\n* Absorbs Punch(H/M) during 1 to 3F\n* After absorbs succeeds, connect to Death from Above (During Haze )\n* New Move\n",
+        "name": "Crusader",
+        "notes": "Heat Engager",
         "on_block": "-9",
-        "on_ch": "+17G",
-        "on_hit": "+17G",
-        "recovery": "",
-        "startup": "14f",
+        "on_ch": "",
+        "on_hit": "+15a",
+        "recovery": "r33",
+        "startup": "i14",
         "target": "m"
     },
     {
@@ -103,7 +103,7 @@
         "id": "Raven-1,2",
         "input": "1,2",
         "name": "Left Right Combo",
-        "notes": "\n* Combo from 1st hit with 2f delay\n* Jail from 1st attack",
+        "notes": "\n* Jail from 1st attack with 2f delay",
         "on_block": "-3",
         "on_ch": "",
         "on_hit": "+7",
@@ -195,6 +195,20 @@
         "startup": "(2)",
         "target": "h,h,m,sp"
     },
+    {
+        "damage": "20",
+        "gif": "",
+        "id": "Raven-1+2,H.F",
+        "input": "1+2,H.F",
+        "name": "Crusader > Heat Dash",
+        "notes": "",
+        "on_block": "+5",
+        "on_ch": "",
+        "on_hit": "+45a (+35)",
+        "recovery": "r27",
+        "startup": "",
+        "target": "m"
+    },
     {
         "damage": "9",
         "gif": "",
@@ -293,20 +307,6 @@
         "startup": "16f",
         "target": "m"
     },
-    {
-        "damage": "9,16",
-        "gif": "",
-        "id": "Raven-2,4",
-        "input": "2,4",
-        "name": "PK Combo to SSp",
-        "notes": "\n* Combo from 1st hit\n* Shift to Shadow Sprint during hit\n* New Move\n",
-        "on_block": "-8",
-        "on_ch": "KDN",
-        "on_hit": "+8",
-        "recovery": "",
-        "startup": "(1)",
-        "target": "h,h,sp"
-    },
     {
         "damage": "9,16",
         "gif": "",
@@ -321,6 +321,20 @@
         "startup": ",i18~19",
         "target": "h,h"
     },
+    {
+        "damage": "9,16",
+        "gif": "",
+        "id": "Raven-2,4",
+        "input": "2,4",
+        "name": "PK Combo to SSp",
+        "notes": "\n* Combo from 1st hit\n* Shift to Shadow Sprint during hit\n* New Move\n",
+        "on_block": "-8",
+        "on_ch": "KDN",
+        "on_hit": "+8",
+        "recovery": "",
+        "startup": "(1)",
+        "target": "h,h,sp"
+    },
     {
         "damage": "9,16",
         "gif": "",
@@ -383,7 +397,7 @@
         "id": "Raven-3,3",
         "input": "3,3",
         "name": "",
-        "notes": "\n* Combo from 1st hit\n* Jail from 1st attack",
+        "notes": "\n* Jail from 1st attack",
         "on_block": "-8~-7",
         "on_ch": "",
         "on_hit": "+5~+6",
@@ -508,8 +522,8 @@
         "gif": "",
         "id": "Raven-3+4,or,d,3+4,orFC,3+4",
         "input": "3+4,or,d,3+4,orFC,3+4",
-        "name": "Soulzone",
-        "notes": "New Move",
+        "name": "Haze",
+        "notes": "Cost 20F",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
@@ -522,8 +536,8 @@
         "gif": "",
         "id": "Raven-3+4,or,d,3+4,orFC,3+4",
         "input": "3+4,or,d,3+4,orFC,3+4",
-        "name": "Haze",
-        "notes": "Cost 20F",
+        "name": "Soulzone",
+        "notes": "New Move",
         "on_block": "",
         "on_ch": "",
         "on_hit": "",
@@ -579,7 +593,7 @@
         "id": "Raven-4,1",
         "input": "4,1",
         "name": "Brocken Connect",
-        "notes": "\n* Combo from 1st hit\n* Jail from 1st attack",
+        "notes": "\n* Jail from 1st attack",
         "on_block": "-3~-2",
         "on_ch": "",
         "on_hit": "+7~+8",
@@ -699,20 +713,6 @@
         "startup": ",i33~34",
         "target": "m,m,m"
     },
-    {
-        "damage": "21(6)",
-        "gif": "",
-        "id": "Raven-b,1",
-        "input": "b,1",
-        "name": "Elbow Strike to SZ",
-        "notes": "\n* Forces an opponent to crouching on NH\n* Chip damage when guarded\n* Shift to Soulzone on hit or block\n* New Move\n",
-        "on_block": "+7",
-        "on_ch": "",
-        "on_hit": "+10C",
-        "recovery": "",
-        "startup": "16f(1)",
-        "target": "h,sp"
-    },
     {
         "damage": "25",
         "gif": "",
@@ -728,18 +728,18 @@
         "target": "h"
     },
     {
-        "damage": "25",
+        "damage": "21(6)",
         "gif": "",
-        "id": "Raven-b,1+2",
-        "input": "b,1+2",
-        "name": "Alternating Smash",
-        "notes": "New Move",
-        "on_block": "-15",
+        "id": "Raven-b,1",
+        "input": "b,1",
+        "name": "Elbow Strike to SZ",
+        "notes": "\n* Forces an opponent to crouching on NH\n* Chip damage when guarded\n* Shift to Soulzone on hit or block\n* New Move\n",
+        "on_block": "+7",
         "on_ch": "",
-        "on_hit": "KDN+10",
+        "on_hit": "+10C",
         "recovery": "",
-        "startup": "28f(2)",
-        "target": "m"
+        "startup": "16f(1)",
+        "target": "h,sp"
     },
     {
         "damage": "28",
@@ -755,6 +755,20 @@
         "startup": "30f(1)",
         "target": "m"
     },
+    {
+        "damage": "25",
+        "gif": "",
+        "id": "Raven-b,1+2",
+        "input": "b,1+2",
+        "name": "Alternating Smash",
+        "notes": "New Move",
+        "on_block": "-15",
+        "on_ch": "",
+        "on_hit": "KDN+10",
+        "recovery": "",
+        "startup": "28f(2)",
+        "target": "m"
+    },
     {
         "damage": "28,12",
         "gif": "",
@@ -1329,6 +1343,20 @@
         "startup": "",
         "target": "h,m,sp"
     },
+    {
+        "damage": "-",
+        "gif": "",
+        "id": "Raven-BT,4",
+        "input": "BT,4",
+        "name": "Chronos Lathe (Heat Engager)",
+        "notes": "New Move",
+        "on_block": "-5",
+        "on_ch": "",
+        "on_hit": "",
+        "recovery": "",
+        "startup": "19f(1)",
+        "target": "m"
+    },
     {
         "damage": "18",
         "gif": "",
@@ -1357,20 +1385,6 @@
         "startup": "19f(1)",
         "target": "m"
     },
-    {
-        "damage": "-",
-        "gif": "",
-        "id": "Raven-BT,4",
-        "input": "BT,4",
-        "name": "Chronos Lathe (Heat Engager)",
-        "notes": "New Move",
-        "on_block": "-5",
-        "on_ch": "",
-        "on_hit": "",
-        "recovery": "",
-        "startup": "19f(1)",
-        "target": "m"
-    },
     {
         "damage": "17",
         "gif": "",
@@ -1456,29 +1470,29 @@
         "target": "sm"
     },
     {
-        "damage": "21",
+        "damage": "14",
         "gif": "",
         "id": "Raven-BT,d,3",
         "input": "BT,d,3",
-        "name": "Shinobi Cyclone (clean)",
-        "notes": "TC from 4F to 5F",
+        "name": "Shinobi Cyclone",
+        "notes": "",
         "on_block": "-26",
-        "on_ch": "KDN",
-        "on_hit": "KDN",
+        "on_ch": "0",
+        "on_hit": "0",
         "recovery": "",
         "startup": "25f(2)",
         "target": "l"
     },
     {
-        "damage": "14",
+        "damage": "21",
         "gif": "",
         "id": "Raven-BT,d,3",
         "input": "BT,d,3",
-        "name": "Shinobi Cyclone",
-        "notes": "",
+        "name": "Shinobi Cyclone (clean)",
+        "notes": "TC from 4F to 5F",
         "on_block": "-26",
-        "on_ch": "0",
-        "on_hit": "0",
+        "on_ch": "KDN",
+        "on_hit": "KDN",
         "recovery": "",
         "startup": "25f(2)",
         "target": "l"
@@ -1749,6 +1763,34 @@
         "startup": "",
         "target": "sp"
     },
+    {
+        "damage": "5",
+        "gif": "",
+        "id": "Raven-d+1",
+        "input": "d+1",
+        "name": "Crouch Jab",
+        "notes": "\n* Can recover standing with f",
+        "on_block": "-5",
+        "on_ch": "",
+        "on_hit": "+6",
+        "recovery": "r24 FC",
+        "startup": "i10",
+        "target": "sl"
+    },
+    {
+        "damage": "8",
+        "gif": "",
+        "id": "Raven-d+2",
+        "input": "d+2",
+        "name": "Crouch Straight",
+        "notes": "",
+        "on_block": "-4",
+        "on_ch": "",
+        "on_hit": "+7",
+        "recovery": "r23 FC",
+        "startup": "i11",
+        "target": "sl"
+    },
     {
         "damage": "8",
         "gif": "",
@@ -1763,6 +1805,20 @@
         "startup": "11f",
         "target": "sm"
     },
+    {
+        "damage": "10",
+        "gif": "",
+        "id": "Raven-d+3",
+        "input": "d+3",
+        "name": "Stinging Low",
+        "notes": "",
+        "on_block": "-11",
+        "on_ch": "",
+        "on_hit": "+0",
+        "recovery": "r30",
+        "startup": "i15",
+        "target": "L"
+    },
     {
         "damage": "10",
         "gif": "",
@@ -1777,6 +1833,20 @@
         "startup": "15f",
         "target": "l"
     },
+    {
+        "damage": "18",
+        "gif": "",
+        "id": "Raven-d+4",
+        "input": "d+4",
+        "name": "Basilisk Fang",
+        "notes": "",
+        "on_block": "-13",
+        "on_ch": "+13g",
+        "on_hit": "-2",
+        "recovery": "r32 FC",
+        "startup": "i21",
+        "target": "L"
+    },
     {
         "damage": "18",
         "gif": "",
@@ -1791,6 +1861,20 @@
         "startup": "21f",
         "target": "l"
     },
+    {
+        "damage": "13",
+        "gif": "",
+        "id": "Raven-db+2",
+        "input": "db+2",
+        "name": "Assassin's Sting",
+        "notes": "",
+        "on_block": "-4~-3",
+        "on_ch": "",
+        "on_hit": "+5~+6",
+        "recovery": "r24 BT",
+        "startup": "i13~14",
+        "target": "m"
+    },
     {
         "damage": "13",
         "gif": "",
@@ -1805,6 +1889,20 @@
         "startup": "13f(1)",
         "target": "m"
     },
+    {
+        "damage": "13,15",
+        "gif": "",
+        "id": "Raven-db+2,1",
+        "input": "db+2,1",
+        "name": "Assassin's Sting Combo",
+        "notes": "\n* Combo from 1st hit",
+        "on_block": "-1~+0",
+        "on_ch": "",
+        "on_hit": "+8~+9",
+        "recovery": "r19",
+        "startup": ",i22~23",
+        "target": "m,h"
+    },
     {
         "damage": "13,15",
         "gif": "",
@@ -1819,6 +1917,34 @@
         "startup": "(1)",
         "target": "m,h"
     },
+    {
+        "damage": "13,15,21",
+        "gif": "",
+        "id": "Raven-db+2,1,1",
+        "input": "db+2,1,1",
+        "name": "Assassin's Sting  Phantom Javelin",
+        "notes": "\n* \nBalcony break\n* Combo from 2nd CH\n* Available only on hit or block",
+        "on_block": "-14~-13",
+        "on_ch": "",
+        "on_hit": "+2a (-7)",
+        "recovery": "r25",
+        "startup": ",i18~19",
+        "target": "m,h,sm"
+    },
+    {
+        "damage": "13,15",
+        "gif": "",
+        "id": "Raven-db+2,1,3+4",
+        "input": "db+2,1,3+4",
+        "name": "",
+        "notes": "Alternate input: db+2,1~D",
+        "on_block": "-4",
+        "on_ch": "",
+        "on_hit": "+5",
+        "recovery": "r22 SZN",
+        "startup": "",
+        "target": "m,h"
+    },
     {
         "damage": "13,15",
         "gif": "",
@@ -1833,6 +1959,20 @@
         "startup": "(1)",
         "target": "m,h,sp"
     },
+    {
+        "damage": "13,15,21,30",
+        "gif": "",
+        "id": "Raven-db+2,1,H.1",
+        "input": "db+2,1,H.1",
+        "name": "Assassin's Sting  Phantom Javelin",
+        "notes": "\n* \nBalcony break\n* Combo from 2nd CH\n* Available only on hit or block",
+        "on_block": "-3~+5",
+        "on_ch": "",
+        "on_hit": "+2a (-7)",
+        "recovery": "r25",
+        "startup": ",i18~19 i39~47",
+        "target": "m,h,sm,sm"
+    },
     {
         "damage": "13,15,21",
         "gif": "",
@@ -1847,6 +1987,20 @@
         "startup": "(1)",
         "target": "m,h,sm"
     },
+    {
+        "damage": "19",
+        "gif": "",
+        "id": "Raven-db+3",
+        "input": "db+3",
+        "name": "Killer Bee",
+        "notes": "",
+        "on_block": "-12~-11",
+        "on_ch": "+39d",
+        "on_hit": "+5~+6",
+        "recovery": "r30 FC",
+        "startup": "i28~29",
+        "target": "L"
+    },
     {
         "damage": "19",
         "gif": "",
@@ -1861,6 +2015,20 @@
         "startup": "28f",
         "target": "l"
     },
+    {
+        "damage": "21",
+        "gif": "",
+        "id": "Raven-db+4",
+        "input": "db+4",
+        "name": "Shinobi Cyclone",
+        "notes": "",
+        "on_block": "-14~-13",
+        "on_ch": "+37a",
+        "on_hit": "+4c~+5c",
+        "recovery": "r32",
+        "startup": "i24~25",
+        "target": "L"
+    },
     {
         "damage": "21",
         "gif": "",
@@ -2085,6 +2253,20 @@
         "startup": "18f(2)",
         "target": "m"
     },
+    {
+        "damage": "13",
+        "gif": "",
+        "id": "Raven-df+1",
+        "input": "df+1",
+        "name": "Body Blow",
+        "notes": "",
+        "on_block": "-2~-1",
+        "on_ch": "",
+        "on_hit": "+8~+9",
+        "recovery": "r22",
+        "startup": "i14~15",
+        "target": "m"
+    },
     {
         "damage": "13",
         "gif": "",
@@ -2127,6 +2309,34 @@
         "startup": "",
         "target": "sp"
     },
+    {
+        "damage": "13,25",
+        "gif": "",
+        "id": "Raven-df+1,4",
+        "input": "df+1,4",
+        "name": "Body Blow > Phantom Mace",
+        "notes": "\n* \nBalcony break\n* Combo from 1st hit\n* Available only on hit or block",
+        "on_block": "-14~-5",
+        "on_ch": "",
+        "on_hit": "+32a (-26)",
+        "recovery": "r29",
+        "startup": ",i18~27",
+        "target": "m,sm"
+    },
+    {
+        "damage": "13,25,30",
+        "gif": "",
+        "id": "Raven-df+1,H.4",
+        "input": "df+1,H.4",
+        "name": "Body Blow > Phantom Mace",
+        "notes": "\n* \nBalcony break\n* Combo from 1st hit\n* Available only on hit or block",
+        "on_block": "-3~-2",
+        "on_ch": "",
+        "on_hit": "+32a (-26)",
+        "recovery": "r25",
+        "startup": ",i18~27 i16~17",
+        "target": "m,sm,sm"
+    },
     {
         "damage": "13,25",
         "gif": "",
@@ -2141,6 +2351,20 @@
         "startup": "(9)",
         "target": "m,sm"
     },
+    {
+        "damage": "15",
+        "gif": "",
+        "id": "Raven-df+2",
+        "input": "df+2",
+        "name": "Uppercut",
+        "notes": "\n* Launches crouching opponent",
+        "on_block": "-13~-11",
+        "on_ch": "",
+        "on_hit": "+30a (+20)",
+        "recovery": "r28 BT",
+        "startup": "i16~18",
+        "target": "m"
+    },
     {
         "damage": "15",
         "gif": "",
@@ -2155,6 +2379,20 @@
         "startup": "16f(2)",
         "target": "m"
     },
+    {
+        "damage": "15,17",
+        "gif": "",
+        "id": "Raven-df+2,3",
+        "input": "df+2,3",
+        "name": "Meat Hook",
+        "notes": "Balcony break",
+        "on_block": "-8~-7",
+        "on_ch": "",
+        "on_hit": "+28a (+19)",
+        "recovery": "r21",
+        "startup": ",i12~13",
+        "target": "m,h"
+    },
     {
         "damage": "15,17",
         "gif": "",
@@ -2169,6 +2407,20 @@
         "startup": "(1)",
         "target": "m,h"
     },
+    {
+        "damage": "15,24",
+        "gif": "",
+        "id": "Raven-df+2,4",
+        "input": "df+2,4",
+        "name": "Bolt Stunner",
+        "notes": "Balcony break",
+        "on_block": "-15~-14",
+        "on_ch": "",
+        "on_hit": "+11a (+2)",
+        "recovery": "r33",
+        "startup": ",i12~13",
+        "target": "m,m"
+    },
     {
         "damage": "15,24",
         "gif": "",
@@ -2183,6 +2435,20 @@
         "startup": "(1)",
         "target": "m,m"
     },
+    {
+        "damage": "17",
+        "gif": "",
+        "id": "Raven-df+3",
+        "input": "df+3",
+        "name": "Shadow Snap Kick",
+        "notes": "",
+        "on_block": "-9~-8",
+        "on_ch": "+46a (+36)",
+        "on_hit": "+12a",
+        "recovery": "r27",
+        "startup": "i16~17",
+        "target": "h"
+    },
     {
         "damage": "17",
         "gif": "",
@@ -2197,6 +2463,20 @@
         "startup": "16f(1)",
         "target": "h"
     },
+    {
+        "damage": "15",
+        "gif": "",
+        "id": "Raven-df+4",
+        "input": "df+4",
+        "name": "",
+        "notes": "",
+        "on_block": "-9~-8",
+        "on_ch": "",
+        "on_hit": "+2~+3",
+        "recovery": "r27",
+        "startup": "i15~16",
+        "target": "m"
+    },
     {
         "damage": "15",
         "gif": "",
@@ -2211,6 +2491,20 @@
         "startup": "15f(1)",
         "target": "m"
     },
+    {
+        "damage": "15,16",
+        "gif": "",
+        "id": "Raven-df+4,4",
+        "input": "df+4,4",
+        "name": "Pendulum Kick",
+        "notes": "\n* \nBalcony break\n* Combo from 1st hit with 7f delay\n* Input can be delayed 9f\n* Move can be delayed 8f",
+        "on_block": "-14~-13",
+        "on_ch": "",
+        "on_hit": "+6a",
+        "recovery": "r31",
+        "startup": ",i22~25",
+        "target": "m,M"
+    },
     {
         "damage": "15,16",
         "gif": "",
@@ -2225,6 +2519,20 @@
         "startup": "(3)",
         "target": "m,m"
     },
+    {
+        "damage": "15,16,22",
+        "gif": "",
+        "id": "Raven-df,4,4,3",
+        "input": "df+4,4,3",
+        "name": "Pendulum Shadow",
+        "notes": "",
+        "on_block": "-6~-3",
+        "on_ch": "",
+        "on_hit": "+18a",
+        "recovery": "r29",
+        "startup": ",i27~30",
+        "target": "m,M,M"
+    },
     {
         "damage": "15,16,22",
         "gif": "",
@@ -2253,16 +2561,30 @@
         "startup": "",
         "target": "m,m,sp"
     },
+    {
+        "damage": "10,20",
+        "gif": "",
+        "id": "Raven-f+1+2",
+        "input": "f+1+2",
+        "name": "Minos Typhoon",
+        "notes": "\n* \nHeat Engager\n* \nBalcony break\n* Frame advantage is -9 if an attack is absorbed",
+        "on_block": "-14",
+        "on_ch": "",
+        "on_hit": "+30a (+4)",
+        "recovery": "r36",
+        "startup": "i18~19 i26",
+        "target": "m"
+    },
     {
         "damage": "10,20",
         "gif": "",
         "id": "Raven-f,1+2",
         "input": "f,1+2",
-        "name": "Minos Typhoon",
+        "name": "Minos Typhoon (Heat Engager)",
         "notes": "\n* Absorb an attack to power up\n*  - Add chip damage on block\n* New Move\n",
         "on_block": "-14",
-        "on_ch": "KDN-4",
-        "on_hit": "KDN-4",
+        "on_ch": "+17G",
+        "on_hit": "+17G",
         "recovery": "",
         "startup": "18f",
         "target": "h,m"
@@ -2272,11 +2594,11 @@
         "gif": "",
         "id": "Raven-f,1+2",
         "input": "f,1+2",
-        "name": "Minos Typhoon (Heat Engager)",
+        "name": "Minos Typhoon",
         "notes": "\n* Absorb an attack to power up\n*  - Add chip damage on block\n* New Move\n",
         "on_block": "-14",
-        "on_ch": "+17G",
-        "on_hit": "+17G",
+        "on_ch": "KDN-4",
+        "on_hit": "KDN-4",
         "recovery": "",
         "startup": "18f",
         "target": "h,m"
@@ -2295,6 +2617,34 @@
         "startup": "19f",
         "target": "m"
     },
+    {
+        "damage": "10,20",
+        "gif": "",
+        "id": "Raven-f+1+2,H.F",
+        "input": "f+1+2,H.F",
+        "name": "Minos Typhoon > Heat Dash",
+        "notes": "",
+        "on_block": "+5",
+        "on_ch": "",
+        "on_hit": "+34a",
+        "recovery": "r27",
+        "startup": "",
+        "target": "m"
+    },
+    {
+        "damage": "10",
+        "gif": "",
+        "id": "Raven-f+2",
+        "input": "f+2",
+        "name": "",
+        "notes": "",
+        "on_block": "-12~-11",
+        "on_ch": "",
+        "on_hit": "-1~+0",
+        "recovery": "r30",
+        "startup": "i15~16",
+        "target": "m"
+    },
     {
         "damage": "10",
         "gif": "",
@@ -2309,6 +2659,20 @@
         "startup": "15f(1)",
         "target": "m"
     },
+    {
+        "damage": "10,13",
+        "gif": "",
+        "id": "Raven-f+2,3",
+        "input": "f+2,3",
+        "name": "Tartaros",
+        "notes": "\n* \nSpike\n* Combo from 1st hit\n* Can be delayed",
+        "on_block": "-9~-8",
+        "on_ch": "",
+        "on_hit": "+6c~+7c",
+        "recovery": "r27",
+        "startup": ",i21~22",
+        "target": "m,M"
+    },
     {
         "damage": "10,13",
         "gif": "",
@@ -2323,6 +2687,20 @@
         "startup": "(1)",
         "target": "m,m"
     },
+    {
+        "damage": "10,13",
+        "gif": "",
+        "id": "Raven-f+2,3,3+4",
+        "input": "f+2,3,3+4",
+        "name": "",
+        "notes": "\n* Alternate input: f+2,3~D",
+        "on_block": "",
+        "on_ch": "",
+        "on_hit": "",
+        "recovery": "r27 SZN",
+        "startup": "",
+        "target": "m,M"
+    },
     {
         "damage": "10,13",
         "gif": "",
@@ -2337,6 +2715,20 @@
         "startup": "(1)",
         "target": "m,m,sp"
     },
+    {
+        "damage": "18",
+        "gif": "",
+        "id": "Raven-f+3",
+        "input": "f+3",
+        "name": "",
+        "notes": "Homing",
+        "on_block": "-9",
+        "on_ch": "",
+        "on_hit": "+3",
+        "recovery": "r33",
+        "startup": "i17",
+        "target": "m"
+    },
     {
         "damage": "18",
         "gif": "",
@@ -2351,6 +2743,20 @@
         "startup": "17f",
         "target": "m"
     },
+    {
+        "damage": "18,21",
+        "gif": "",
+        "id": "Raven-f+3,2",
+        "input": "f+3,2",
+        "name": "Circling Winds",
+        "notes": "\n* \nBalcony break\n* Combo from 1st hit",
+        "on_block": "-14",
+        "on_ch": "+30a (+22)",
+        "on_hit": "+10a (+1)",
+        "recovery": "r35",
+        "startup": ",i30",
+        "target": "m,m"
+    },
     {
         "damage": "18,21",
         "gif": "",
@@ -2365,6 +2771,20 @@
         "startup": "",
         "target": "m,m"
     },
+    {
+        "damage": "18",
+        "gif": "",
+        "id": "Raven-f+3~B",
+        "input": "f+3~B",
+        "name": "",
+        "notes": "",
+        "on_block": "-6",
+        "on_ch": "",
+        "on_hit": "+6",
+        "recovery": "r30 BT",
+        "startup": "",
+        "target": "m"
+    },
     {
         "damage": "18",
         "gif": "",
@@ -2379,6 +2799,20 @@
         "startup": "",
         "target": "m"
     },
+    {
+        "damage": "23",
+        "gif": "",
+        "id": "Raven-f+4",
+        "input": "f+4",
+        "name": "Lance Kick",
+        "notes": "Balcony break",
+        "on_block": "-9~-8",
+        "on_ch": "",
+        "on_hit": "+31a (+23)",
+        "recovery": "r33",
+        "startup": "i15~16",
+        "target": "h"
+    },
     {
         "damage": "23",
         "gif": "",
@@ -2603,20 +3037,6 @@
         "startup": "26f(2)",
         "target": "m,sp"
     },
-    {
-        "damage": "20",
-        "gif": "",
-        "id": "Raven-H.1+2,F",
-        "input": "H.1+2,F",
-        "name": "Crusader > Heat Dash",
-        "notes": "",
-        "on_block": "+5",
-        "on_ch": "",
-        "on_hit": "+45a (+35)",
-        "recovery": "r27",
-        "startup": "i14",
-        "target": "m"
-    },
     {
         "damage": "20,35",
         "gif": "",
@@ -3154,7 +3574,7 @@
         "gif": "",
         "id": "Raven-SZ,2",
         "input": "SZ,2",
-        "name": "Dual Thanatos",
+        "name": "Dual Thanatos (Heat Engager)",
         "notes": "New Move",
         "on_block": "-9",
         "on_ch": "",
@@ -3168,7 +3588,7 @@
         "gif": "",
         "id": "Raven-SZ,2",
         "input": "SZ,2",
-        "name": "Dual Thanatos (Heat Engager)",
+        "name": "Dual Thanatos",
         "notes": "New Move",
         "on_block": "-9",
         "on_ch": "",
diff --git a/src/main.py b/src/main.py
index 3c8efc5..4540f46 100644
--- a/src/main.py
+++ b/src/main.py
@@ -17,7 +17,7 @@
 
 base_path = os.path.dirname(__file__)
 config = configurator.Configurator(os.path.abspath(os.path.join(base_path, "resources", "config.json")))
-character_list_path = "resources/character_list.json"
+CHARACTER_LIST_PATH = "./resources/character_list.json"
 discord_token = config.read_config()['DISCORD_TOKEN']
 
 character_list = []
@@ -78,12 +78,12 @@ def schedule_create_json_movelists(character_list_path: str, scheduler):
 
 
 try:
-    character_list = create_json_movelists(character_list_path)
+    character_list = create_json_movelists(CHARACTER_LIST_PATH)
     print("Character jsons are successfully created")
     scheduler = sched.scheduler(time.time, time.sleep)
 
     ## Repeat importing move list of all character from wavu.wiki once an hour
-    scheduler.enter(3600, 1, schedule_create_json_movelists, (character_list_path, scheduler,))
+    scheduler.enter(3600, 1, schedule_create_json_movelists, (CHARACTER_LIST_PATH, scheduler,))
     Thread(target=scheduler.run).start()
 
     client.run(discord_token)