diff --git a/route/rogue/Combat/Herta_SupplyZone_F2.py b/route/rogue/Combat/Herta_SupplyZone_F2.py
index 68bde55d3..072bdfde8 100644
--- a/route/rogue/Combat/Herta_SupplyZone_F2.py
+++ b/route/rogue/Combat/Herta_SupplyZone_F2.py
@@ -47,7 +47,8 @@ class Route(RouteBase):
         # self.clear_item(item2)
         self.clear_enemy(
             door2.set_threshold(3),
-            enemy2left.straight_run(),
+            # Go through door
+            enemy2left,
             enemy2right.straight_run(),
         )
         # 3
diff --git a/route/rogue/Combat/Jarilo_GreatMine_F1.py b/route/rogue/Combat/Jarilo_GreatMine_F1.py
index 553c3039c..dac6f437e 100644
--- a/route/rogue/Combat/Jarilo_GreatMine_F1.py
+++ b/route/rogue/Combat/Jarilo_GreatMine_F1.py
@@ -13,9 +13,13 @@ class Route(RouteBase):
         | item     | Waypoint((60.2, 358.5)), | 319.8     | 308      |
         | enemy    | Waypoint((60.2, 336.8)), | 340.7     | 149      |
         | exit_    | Waypoint((57.4, 329.5)), | 22.8      | 334      |
+        | exit1    | Waypoint((45.4, 329.6)), | 337.2     | 334      |
+        | exit2    | Waypoint((61.5, 319.1)), | 337.4     | 336      |
         """
         self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(84.4, 378.7))
-        self.register_domain_exit(Waypoint((57.4, 329.5)), end_rotation=334)
+        self.register_domain_exit(
+            Waypoint((57.4, 329.5)), end_rotation=334,
+            left_door=Waypoint((45.4, 329.6)), right_door=Waypoint((61.5, 319.1)))
         item = Waypoint((60.2, 358.5))
         enemy = Waypoint((60.2, 336.8))
         # ===== End of generated waypoints =====
@@ -31,9 +35,13 @@ class Route(RouteBase):
         | item     | Waypoint((60.2, 358.4)), | 308.0     | 304      |
         | enemy    | Waypoint((57.2, 330.8)), | 85.8      | 336      |
         | exit_    | Waypoint((57.2, 330.8)), | 85.8      | 336      |
+        | exit1    | Waypoint((45.4, 329.6)), | 337.2     | 334      |
+        | exit2    | Waypoint((61.5, 319.1)), | 337.4     | 336      |
         """
         self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(91.4, 392.4))
-        self.register_domain_exit(Waypoint((57.2, 330.8)), end_rotation=336)
+        self.register_domain_exit(
+            Waypoint((57.2, 330.8)), end_rotation=336,
+            left_door=Waypoint((45.4, 329.6)), right_door=Waypoint((61.5, 319.1)))
         item = Waypoint((60.2, 358.4))
         enemy = Waypoint((57.2, 330.8))
         # ===== End of generated waypoints =====
@@ -41,6 +49,32 @@ class Route(RouteBase):
         self.clear_item(item)
         self.clear_enemy(enemy)
 
+    def Jarilo_GreatMine_F1_X89Y387(self):
+        """
+        | Waypoint | Position                 | Direction | Rotation |
+        | -------- | ------------------------ | --------- | -------- |
+        | spawn    | Waypoint((91.4, 392.4)), | 334.8     | 331      |
+        | item     | Waypoint((60.2, 358.4)), | 308.0     | 304      |
+        | enemy    | Waypoint((57.2, 330.8)), | 85.8      | 336      |
+        | exit_    | Waypoint((57.2, 330.8)), | 85.8      | 336      |
+        """
+        self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(89.4, 387.6))
+        self.register_domain_exit(
+            Waypoint((57.2, 330.8)), end_rotation=336,
+            left_door=Waypoint((45.4, 329.6)), right_door=Waypoint((61.5, 319.1)))
+        item = Waypoint((60.2, 358.4))
+        enemy = Waypoint((57.2, 330.8))
+        # ===== End of generated waypoints =====
+
+        self.clear_item(item)
+        self.clear_enemy(enemy)
+
+        """
+        Notes
+        Jarilo_GreatMine_F1_X89Y387 is the same as Jarilo_GreatMine_F1_X91Y391
+        but for wrong spawn point detected
+        """
+
     def Jarilo_GreatMine_F1_X133Y465(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
diff --git a/route/rogue/Combat/Jarilo_RivetTown_F1.py b/route/rogue/Combat/Jarilo_RivetTown_F1.py
index 646911501..b10160527 100644
--- a/route/rogue/Combat/Jarilo_RivetTown_F1.py
+++ b/route/rogue/Combat/Jarilo_RivetTown_F1.py
@@ -108,9 +108,13 @@ class Route(RouteBase):
         | enemy2middle | Waypoint((290.0, 174.6)), | 92.7      | 84       |
         | enemy3       | Waypoint((319.6, 153.1)), | 76.4      | 73       |
         | exit_        | Waypoint((317.4, 155.3)), | 60.9      | 73       |
+        | exit1        | Waypoint((326.6, 145.2)), | 75.0      | 66       |
+        | exit2        | Waypoint((331.2, 157.6)), | 87.7      | 78       |
         """
         self.map_init(plane=Jarilo_RivetTown, floor="F1", position=(231.4, 211.1))
-        self.register_domain_exit(Waypoint((317.4, 155.3)), end_rotation=73)
+        self.register_domain_exit(
+            Waypoint((317.4, 155.3)), end_rotation=73,
+            left_door=Waypoint((326.6, 145.2)), right_door=Waypoint((331.2, 157.6)))
         item1 = Waypoint((236.7, 180.5))
         node2 = Waypoint((256.9, 180.9))
         enemy1 = Waypoint((256.6, 169.0))
diff --git a/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py b/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py
index 5435f1f37..22db18523 100644
--- a/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py
+++ b/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py
@@ -1,5 +1,6 @@
 from tasks.map.control.waypoint import Waypoint
 from tasks.map.keywords.plane import Jarilo_SilvermaneGuardRestrictedZone
+from tasks.map.route.base import locked_position
 from tasks.rogue.route.base import RouteBase
 
 
@@ -64,6 +65,7 @@ class Route(RouteBase):
         self.clear_item(item)
         self.clear_enemy(enemy)
 
+    @locked_position
     def Jarilo_SilvermaneGuardRestrictedZone_F1_X227Y425(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
@@ -86,6 +88,7 @@ class Route(RouteBase):
         # Ignore item
         self.clear_enemy(enemy)
 
+    @locked_position
     def Jarilo_SilvermaneGuardRestrictedZone_F1_X227Y432(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
diff --git a/route/rogue/Combat/Luofu_Cloudford_F1.py b/route/rogue/Combat/Luofu_Cloudford_F1.py
index 47e8442c0..0a8314ad3 100644
--- a/route/rogue/Combat/Luofu_Cloudford_F1.py
+++ b/route/rogue/Combat/Luofu_Cloudford_F1.py
@@ -14,9 +14,13 @@ class Route(RouteBase):
         | item     | Waypoint((222.4, 934.6)), | 311.8     | 306      |
         | enemy    | Waypoint((197.2, 947.4)), | 282.6     | 260      |
         | exit_    | Waypoint((193.1, 947.2)), | 12.8      | 274      |
+        | exit1    | Waypoint((183.6, 957.4)), | 275.8     | 267      |
+        | exit2    | Waypoint((183.4, 939.2)), | 284.6     | 258      |
         """
         self.map_init(plane=Luofu_Cloudford, floor="F1", position=(240.4, 947.6))
-        self.register_domain_exit(Waypoint((193.1, 947.2)), end_rotation=274)
+        self.register_domain_exit(
+            Waypoint((193.1, 947.2)), end_rotation=274,
+            left_door=Waypoint((183.6, 957.4)), right_door=Waypoint((183.4, 939.2)))
         node = Waypoint((218.8, 948.8))
         item = Waypoint((222.4, 934.6))
         enemy = Waypoint((197.2, 947.4))
diff --git a/route/rogue/Combat/Luofu_StargazerNavalia_F1.py b/route/rogue/Combat/Luofu_StargazerNavalia_F1.py
index 9ea884489..dd07e2474 100644
--- a/route/rogue/Combat/Luofu_StargazerNavalia_F1.py
+++ b/route/rogue/Combat/Luofu_StargazerNavalia_F1.py
@@ -32,14 +32,18 @@ class Route(RouteBase):
     @locked_position
     def Luofu_StargazerNavalia_F1_X203Y317(self):
         """
-        | Waypoint | Position                  | Direction | Rotation |
-        | -------- | ------------------------- | --------- | -------- |
-        | spawn    | Waypoint((203.8, 317.4)), | 96.7      | 91       |
-        | enemy    | Waypoint((254.2, 318.9)), | 96.8      | 91       |
-        | exit_    | Waypoint((254.2, 318.9)), | 96.8      | 91       |
+        | Waypoint       | Position                  | Direction | Rotation |
+        | -------------- | ------------------------- | --------- | -------- |
+        | spawn          | Waypoint((203.8, 317.4)), | 96.7      | 91       |
+        | enemy          | Waypoint((254.2, 318.9)), | 96.8      | 91       |
+        | exit_          | Waypoint((254.2, 318.9)), | 96.8      | 91       |
+        | exit1_X258Y313 | Waypoint((258.1, 313.3)), | 94.2      | 91       |
+        | exit2          | Waypoint((257.6, 325.5)), | 94.2      | 91       |
         """
         self.map_init(plane=Luofu_StargazerNavalia, floor="F1", position=(203.8, 317.4))
-        self.register_domain_exit(Waypoint((254.2, 318.9)), end_rotation=91)
+        self.register_domain_exit(
+            Waypoint((254.2, 318.9)), end_rotation=91,
+            left_door=Waypoint((258.1, 313.3)), right_door=Waypoint((257.6, 325.5)))
         enemy = Waypoint((254.2, 318.9))
         # ===== End of generated waypoints =====
 
diff --git a/route/rogue/Occurrence/Luofu_StargazerNavalia_F1.py b/route/rogue/Occurrence/Luofu_StargazerNavalia_F1.py
index a23a262bd..80523c9d0 100644
--- a/route/rogue/Occurrence/Luofu_StargazerNavalia_F1.py
+++ b/route/rogue/Occurrence/Luofu_StargazerNavalia_F1.py
@@ -1,12 +1,13 @@
 from tasks.map.control.waypoint import Waypoint
 from tasks.map.keywords.plane import Luofu_StargazerNavalia
-from tasks.map.route.base import locked_position
+from tasks.map.route.base import locked_position, locked_rotation
 from tasks.rogue.route.base import RouteBase
 
 
 class Route(RouteBase):
 
     @locked_position
+    @locked_rotation(180)
     def Luofu_StargazerNavalia_F1_X250Y498(self):
         """
         | Waypoint       | Position                  | Direction | Rotation |
diff --git a/route/rogue/route.json b/route/rogue/route.json
index 190ce619a..72ae0d3a2 100644
--- a/route/rogue/route.json
+++ b/route/rogue/route.json
@@ -384,6 +384,17 @@
     ],
     "domain": "Combat"
   },
+  {
+    "name": "Combat_Jarilo_GreatMine_F1_X89Y387",
+    "route": "route.rogue.Combat.Jarilo_GreatMine_F1:Jarilo_GreatMine_F1_X89Y387",
+    "plane": "Jarilo_GreatMine",
+    "floor": "F1",
+    "position": [
+      89.4,
+      387.6
+    ],
+    "domain": "Combat"
+  },
   {
     "name": "Combat_Jarilo_GreatMine_F1_X133Y465",
     "route": "route.rogue.Combat.Jarilo_GreatMine_F1:Jarilo_GreatMine_F1_X133Y465",