diff --git a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py
index 82d05bd52..cf6e38389 100644
--- a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py
+++ b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py
@@ -59,6 +59,21 @@ class Route(RouteBase):
         # 3
         self.clear_enemy(enemy3)
 
+    def Jarilo_CorridorofFadingEchoes_F1_X266Y457(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((267.0, 457.2)), | 274.2     | 274      |
+        | enemy    | Waypoint((220.2, 457.6)), | 185.8     | 274      |
+        | exit     | Waypoint((208.6, 458.6)), | 274.2     | 276      |
+        """
+        self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(267.0, 457.2))
+        self.register_domain_exit(Waypoint((208.6, 458.6)), end_rotation=276)
+        enemy = Waypoint((220.2, 457.6))
+        # ===== End of generated waypoints =====
+
+        self.clear_enemy(enemy)
+
     def Jarilo_CorridorofFadingEchoes_F1_X291Y765(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
@@ -94,3 +109,61 @@ class Route(RouteBase):
 
         # Ignore item, bad way
         self.clear_enemy(enemy)
+
+    def Jarilo_CorridorofFadingEchoes_F1_X369Y439(self):
+        """
+        | Waypoint    | Position                  | Direction | Rotation |
+        | ----------- | ------------------------- | --------- | -------- |
+        | spawn       | Waypoint((369.4, 439.2)), | 96.7      | 91       |
+        | enemy1      | Waypoint((408.2, 430.6)), | 87.7      | 80       |
+        | enemy2right | Waypoint((444.6, 466.0)), | 129.8     | 124      |
+        | enemy4      | Waypoint((452.2, 392.2)), | 318.0     | 318      |
+        | enemy2left  | Waypoint((475.0, 462.4)), | 67.2      | 64       |
+        | node4       | Waypoint((493.0, 437.4)), | 4.1       | 359      |
+        | node3       | Waypoint((493.0, 449.0)), | 190.0     | 43       |
+        | exit        | Waypoint((452.2, 392.2)), | 318.0     | 318      |
+        """
+        self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(369.4, 439.2))
+        self.register_domain_exit(Waypoint((452.2, 392.2)), end_rotation=318)
+        enemy1 = Waypoint((408.2, 430.6))
+        enemy2right = Waypoint((444.6, 466.0))
+        enemy4 = Waypoint((452.2, 392.2))
+        enemy2left = Waypoint((475.0, 462.4))
+        node4 = Waypoint((493.0, 437.4))
+        node3 = Waypoint((493.0, 449.0))
+        # ===== End of generated waypoints =====
+
+        self.clear_enemy(enemy1)
+        self.clear_enemy(
+            enemy2right.straight_run(),
+            enemy2left.straight_run(),
+        )
+        self.clear_enemy(
+            node3.straight_run(),
+            node4.straight_run(),
+            enemy4.straight_run(),
+        )
+
+    def Jarilo_CorridorofFadingEchoes_F1_X463Y123(self):
+        """
+        | Waypoint      | Position                  | Direction | Rotation |
+        | ------------- | ------------------------- | --------- | -------- |
+        | spawn         | Waypoint((463.3, 123.5)), | 96.7      | 91       |
+        | item_X476Y129 | Waypoint((476.9, 129.9)), | 116.8     | 114      |
+        | enemy1        | Waypoint((544.4, 128.5)), | 129.9     | 128      |
+        | node2         | Waypoint((554.6, 143.6)), | 166.6     | 158      |
+        | enemy2        | Waypoint((556.4, 206.8)), | 190.1     | 184      |
+        | exit          | Waypoint((556.4, 206.8)), | 190.1     | 184      |
+        """
+        self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(463.3, 123.5))
+        self.register_domain_exit(Waypoint((556.4, 206.8)), end_rotation=184)
+        item_X476Y129 = Waypoint((476.9, 129.9))
+        enemy1 = Waypoint((544.4, 128.5))
+        node2 = Waypoint((554.6, 143.6))
+        enemy2 = Waypoint((556.4, 206.8))
+        # ===== End of generated waypoints =====
+
+        self.rotation_set(158)
+        self.clear_item(item_X476Y129)
+        self.clear_enemy(enemy1)
+        self.clear_enemy(enemy2.straight_run())
diff --git a/route/rogue/Combat/Jarilo_GreatMine_F1.py b/route/rogue/Combat/Jarilo_GreatMine_F1.py
index cbffe238a..9b1f768b9 100644
--- a/route/rogue/Combat/Jarilo_GreatMine_F1.py
+++ b/route/rogue/Combat/Jarilo_GreatMine_F1.py
@@ -184,9 +184,11 @@ class Route(RouteBase):
         # ===== End of generated waypoints =====
 
         self.clear_item(item1)
-        self.clear_item(item2)
         self.rotation_set(232)
-        self.clear_enemy(enemy3)
+        self.clear_enemy(
+            item2,
+            enemy3,
+        )
         # self.clear_item(item3.straight_run())
         self.clear_enemy(
             item3.straight_run(),
diff --git a/route/rogue/Combat/Luofu_Cloudford_F1.py b/route/rogue/Combat/Luofu_Cloudford_F1.py
index fc61da7d4..bee902e5f 100644
--- a/route/rogue/Combat/Luofu_Cloudford_F1.py
+++ b/route/rogue/Combat/Luofu_Cloudford_F1.py
@@ -80,6 +80,29 @@ class Route(RouteBase):
             enemy
         )
 
+    def Luofu_Cloudford_F1_X281Y873(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((283.4, 865.3)), | 6.7       | 4        |
+        | item     | Waypoint((297.0, 841.4)), | 36.1      | 31       |
+        | enemy    | Waypoint((282.4, 814.2)), | 8.1       | 1        |
+        | exit     | Waypoint((284.5, 816.8)), | 5.7       | 1        |
+        """
+        self.map_init(plane=Luofu_Cloudford, floor="F1", position=(281, 873))
+        self.register_domain_exit(Waypoint((284.5, 816.8)), end_rotation=1)
+        item = Waypoint((297.0, 841.4))
+        enemy = Waypoint((282.4, 814.2))
+        # ===== End of generated waypoints =====
+
+        """
+        Notes
+        Luofu_Cloudford_F1_X281Y873 is the same as Luofu_Cloudford_F1_X283Y865
+        but for wrong spawn point detected
+        """
+        self.clear_item(item)
+        self.clear_enemy(enemy)
+
     def Luofu_Cloudford_F1_X283Y865(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
diff --git a/route/rogue/Combat/Luofu_StargazerNavalia_F1.py b/route/rogue/Combat/Luofu_StargazerNavalia_F1.py
index 0c3ba1b47..27216ad15 100644
--- a/route/rogue/Combat/Luofu_StargazerNavalia_F1.py
+++ b/route/rogue/Combat/Luofu_StargazerNavalia_F1.py
@@ -96,3 +96,18 @@ class Route(RouteBase):
 
         self.clear_item(item)
         self.clear_enemy(enemy)
+
+    def Luofu_StargazerNavalia_F1_X521Y447(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((521.4, 447.5)), | 188.1     | 181      |
+        | enemy    | Waypoint((521.2, 507.2)), | 98.8      | 186      |
+        | exit     | Waypoint((521.2, 507.2)), | 98.8      | 186      |
+        """
+        self.map_init(plane=Luofu_StargazerNavalia, floor="F1", position=(521.4, 447.5))
+        self.register_domain_exit(Waypoint((521.2, 507.2)), end_rotation=186)
+        enemy = Waypoint((521.2, 507.2))
+        # ===== End of generated waypoints =====
+
+        self.clear_enemy(enemy)
diff --git a/route/rogue/Occurrence/Luofu_Cloudford_F1.py b/route/rogue/Occurrence/Luofu_Cloudford_F1.py
index 4cd5610ed..2810c509f 100644
--- a/route/rogue/Occurrence/Luofu_Cloudford_F1.py
+++ b/route/rogue/Occurrence/Luofu_Cloudford_F1.py
@@ -20,6 +20,30 @@ class Route(RouteBase):
         self.clear_event(event)
         # ===== End of generated waypoints =====
 
+    def Luofu_Cloudford_F1_X281Y873(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((283.2, 865.2)), | 6.7       | 4        |
+        | item     | Waypoint((272.2, 840.2)), | 332.7     | 327      |
+        | event    | Waypoint((291.8, 822.2)), | 26.8      | 22       |
+        | exit     | Waypoint((285.3, 818.1)), | 99.0      | 1        |
+        """
+        self.map_init(plane=Luofu_Cloudford, floor="F1", position=(281, 873))
+        self.register_domain_exit(Waypoint((285.3, 818.1)), end_rotation=1)
+        item = Waypoint((272.2, 840.2))
+        event = Waypoint((291.8, 822.2))
+
+        self.clear_item(item)
+        self.clear_event(event)
+        # ===== End of generated waypoints =====
+
+        """
+        Notes
+        Luofu_Cloudford_F1_X281Y873 is the same as Luofu_Cloudford_F1_X283Y865
+        but for wrong spawn point detected
+        """
+
     def Luofu_Cloudford_F1_X283Y865(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
@@ -37,3 +61,21 @@ class Route(RouteBase):
         self.clear_item(item)
         self.clear_event(event)
         # ===== End of generated waypoints =====
+
+    def Luofu_Cloudford_F1_X537Y373(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((537.4, 373.3)), | 96.7      | 91       |
+        | item     | Waypoint((567.0, 346.6)), | 96.7      | 91       |
+        | event    | Waypoint((580.8, 363.0)), | 94.2      | 91       |
+        | exit     | Waypoint((593.4, 373.4)), | 96.7      | 94       |
+        """
+        self.map_init(plane=Luofu_Cloudford, floor="F1", position=(537.4, 373.3))
+        self.register_domain_exit(Waypoint((593.4, 373.4)), end_rotation=94)
+        item = Waypoint((567.0, 346.6))
+        event = Waypoint((580.8, 363.0))
+
+        self.clear_item(item)
+        self.clear_event(event)
+        # ===== End of generated waypoints =====
diff --git a/route/rogue/Respite/Luofu_StargazerNavalia_F2Rogue.py b/route/rogue/Respite/Luofu_StargazerNavalia_F2Rogue.py
index 7a8d6bd22..e35dd450e 100644
--- a/route/rogue/Respite/Luofu_StargazerNavalia_F2Rogue.py
+++ b/route/rogue/Respite/Luofu_StargazerNavalia_F2Rogue.py
@@ -5,6 +5,31 @@ from tasks.rogue.route.base import RouteBase
 
 class Route(RouteBase):
 
+    def Luofu_StargazerNavalia_F2Rogue_X569Y275(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((574.8, 275.0)), | 256.7     | 253      |
+        | item     | Waypoint((553.4, 273.2)), | 294.6     | 292      |
+        | herta    | Waypoint((533.4, 286.9)), | 271.8     | 269      |
+        | exit     | Waypoint((515.4, 299.2)), | 239.8     | 239      |
+        """
+        self.map_init(plane=Luofu_StargazerNavalia, floor="F2Rogue", position=(569, 275.0))
+        item = Waypoint((553.4, 273.2))
+        herta = Waypoint((533.4, 286.9))
+        exit_ = Waypoint((515.4, 299.2))
+
+        self.clear_item(item)
+        self.domain_herta(herta)
+        self.domain_single_exit(exit_)
+        # ===== End of generated waypoints =====
+
+        """
+        Notes
+        Luofu_StargazerNavalia_F2Rogue_X569Y275 is the same as Luofu_StargazerNavalia_F2Rogue_X574Y275
+        but for wrong spawn point detected
+        """
+
     def Luofu_StargazerNavalia_F2Rogue_X574Y275(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
diff --git a/route/rogue/route.json b/route/rogue/route.json
index 1569bfdb9..6eaa16f64 100644
--- a/route/rogue/route.json
+++ b/route/rogue/route.json
@@ -263,6 +263,17 @@
     ],
     "domain": "Combat"
   },
+  {
+    "name": "Combat_Jarilo_CorridorofFadingEchoes_F1_X266Y457",
+    "route": "route.rogue.Combat.Jarilo_CorridorofFadingEchoes_F1:Jarilo_CorridorofFadingEchoes_F1_X266Y457",
+    "plane": "Jarilo_CorridorofFadingEchoes",
+    "floor": "F1",
+    "position": [
+      267.0,
+      457.2
+    ],
+    "domain": "Combat"
+  },
   {
     "name": "Combat_Jarilo_CorridorofFadingEchoes_F1_X291Y765",
     "route": "route.rogue.Combat.Jarilo_CorridorofFadingEchoes_F1:Jarilo_CorridorofFadingEchoes_F1_X291Y765",
@@ -285,6 +296,28 @@
     ],
     "domain": "Combat"
   },
+  {
+    "name": "Combat_Jarilo_CorridorofFadingEchoes_F1_X369Y439",
+    "route": "route.rogue.Combat.Jarilo_CorridorofFadingEchoes_F1:Jarilo_CorridorofFadingEchoes_F1_X369Y439",
+    "plane": "Jarilo_CorridorofFadingEchoes",
+    "floor": "F1",
+    "position": [
+      369.4,
+      439.2
+    ],
+    "domain": "Combat"
+  },
+  {
+    "name": "Combat_Jarilo_CorridorofFadingEchoes_F1_X463Y123",
+    "route": "route.rogue.Combat.Jarilo_CorridorofFadingEchoes_F1:Jarilo_CorridorofFadingEchoes_F1_X463Y123",
+    "plane": "Jarilo_CorridorofFadingEchoes",
+    "floor": "F1",
+    "position": [
+      463.3,
+      123.5
+    ],
+    "domain": "Combat"
+  },
   {
     "name": "Combat_Jarilo_GreatMine_F1_X84Y378",
     "route": "route.rogue.Combat.Jarilo_GreatMine_F1:Jarilo_GreatMine_F1_X84Y378",
@@ -593,6 +626,17 @@
     ],
     "domain": "Combat"
   },
+  {
+    "name": "Combat_Luofu_Cloudford_F1_X281Y873",
+    "route": "route.rogue.Combat.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X281Y873",
+    "plane": "Luofu_Cloudford",
+    "floor": "F1",
+    "position": [
+      281.0,
+      873.0
+    ],
+    "domain": "Combat"
+  },
   {
     "name": "Combat_Luofu_Cloudford_F1_X283Y865",
     "route": "route.rogue.Combat.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X283Y865",
@@ -725,6 +769,17 @@
     ],
     "domain": "Combat"
   },
+  {
+    "name": "Combat_Luofu_StargazerNavalia_F1_X521Y447",
+    "route": "route.rogue.Combat.Luofu_StargazerNavalia_F1:Luofu_StargazerNavalia_F1_X521Y447",
+    "plane": "Luofu_StargazerNavalia",
+    "floor": "F1",
+    "position": [
+      521.4,
+      447.5
+    ],
+    "domain": "Combat"
+  },
   {
     "name": "Combat_Luofu_StargazerNavalia_F2_X627Y179",
     "route": "route.rogue.Combat.Luofu_StargazerNavalia_F2:Luofu_StargazerNavalia_F2_X627Y179",
@@ -1198,6 +1253,17 @@
     ],
     "domain": "Occurrence"
   },
+  {
+    "name": "Occurrence_Luofu_Cloudford_F1_X281Y873",
+    "route": "route.rogue.Occurrence.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X281Y873",
+    "plane": "Luofu_Cloudford",
+    "floor": "F1",
+    "position": [
+      281.0,
+      873.0
+    ],
+    "domain": "Occurrence"
+  },
   {
     "name": "Occurrence_Luofu_Cloudford_F1_X283Y865",
     "route": "route.rogue.Occurrence.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X283Y865",
@@ -1209,6 +1275,17 @@
     ],
     "domain": "Occurrence"
   },
+  {
+    "name": "Occurrence_Luofu_Cloudford_F1_X537Y373",
+    "route": "route.rogue.Occurrence.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X537Y373",
+    "plane": "Luofu_Cloudford",
+    "floor": "F1",
+    "position": [
+      537.4,
+      373.3
+    ],
+    "domain": "Occurrence"
+  },
   {
     "name": "Occurrence_Luofu_StargazerNavalia_F2_X579Y183",
     "route": "route.rogue.Occurrence.Luofu_StargazerNavalia_F2:Luofu_StargazerNavalia_F2_X579Y183",
@@ -1319,6 +1396,17 @@
     ],
     "domain": "Respite"
   },
+  {
+    "name": "Respite_Luofu_StargazerNavalia_F2Rogue_X569Y275",
+    "route": "route.rogue.Respite.Luofu_StargazerNavalia_F2Rogue:Luofu_StargazerNavalia_F2Rogue_X569Y275",
+    "plane": "Luofu_StargazerNavalia",
+    "floor": "F2Rogue",
+    "position": [
+      569.0,
+      275.0
+    ],
+    "domain": "Respite"
+  },
   {
     "name": "Respite_Luofu_StargazerNavalia_F2Rogue_X574Y275",
     "route": "route.rogue.Respite.Luofu_StargazerNavalia_F2Rogue:Luofu_StargazerNavalia_F2Rogue_X574Y275",
diff --git a/tasks/base/main_page.py b/tasks/base/main_page.py
index 4027098ee..dad67ebe6 100644
--- a/tasks/base/main_page.py
+++ b/tasks/base/main_page.py
@@ -32,6 +32,8 @@ class OcrPlaneName(Ocr):
         # Domain'--Occurence
         # Domain-Qccurrence
         result = result.replace('cunr', 'cur').replace('uren', 'urren').replace('Qcc', 'Occ')
+        # Domain-Elit
+        result = re.sub(r'[Ee]lit$', 'Elite', result)
 
         # 区域－战
         result = re.sub(r'区域.*战$', '区域战斗', result)