diff --git a/Assets/Data/Templates/CreepTemplate.prefab b/Assets/Data/Templates/CreepTemplate.prefab
index ec27f69..5b388f8 100644
--- a/Assets/Data/Templates/CreepTemplate.prefab
+++ b/Assets/Data/Templates/CreepTemplate.prefab
@@ -142,7 +142,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyAIController
   ShowTopMostFoldoutHeaderGroup: 1
   aiType: 2
-  detectionRange: 15
+  detectionRange: 6
   detectionAngle: 360
   playerLayer:
     serializedVersion: 2
diff --git a/Assets/Data/Templates/MonsterTemplate.prefab b/Assets/Data/Templates/MonsterTemplate.prefab
index ed7b86f..1fa110d 100644
--- a/Assets/Data/Templates/MonsterTemplate.prefab
+++ b/Assets/Data/Templates/MonsterTemplate.prefab
@@ -142,7 +142,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyAIController
   ShowTopMostFoldoutHeaderGroup: 1
   aiType: 3
-  detectionRange: 15
+  detectionRange: 6
   detectionAngle: 360
   playerLayer:
     serializedVersion: 2
diff --git a/Assets/Prefabs/Blacksmith.prefab b/Assets/Prefabs/Blacksmith.prefab
index d9a6268..a72eb3b 100644
--- a/Assets/Prefabs/Blacksmith.prefab
+++ b/Assets/Prefabs/Blacksmith.prefab
@@ -49,11 +49,11 @@ BoxCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Size: {x: 7, y: 7, z: 7}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &8736618315465008189
 MonoBehaviour:
@@ -67,8 +67,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject
-  GlobalObjectIdHash: 3845453594
-  InScenePlacedSourceGlobalObjectIdHash: 0
+  GlobalObjectIdHash: 1738409839
+  InScenePlacedSourceGlobalObjectIdHash: 3845453594
   DeferredDespawnTick: 0
   Ownership: 0
   AlwaysReplicateAsRoot: 0
@@ -135,10 +135,40 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d40509d02a450cd45b817e95de22ef8b, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 9130994837512732106}
   m_SourcePrefab: {fileID: 100100000, guid: d40509d02a450cd45b817e95de22ef8b, type: 3}
 --- !u!4 &6055409792794235185 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d40509d02a450cd45b817e95de22ef8b, type: 3}
   m_PrefabInstance: {fileID: 6017823276457359066}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &6864316733236988811 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d40509d02a450cd45b817e95de22ef8b, type: 3}
+  m_PrefabInstance: {fileID: 6017823276457359066}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &9130994837512732106
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864316733236988811}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -5081918453065902996, guid: d40509d02a450cd45b817e95de22ef8b, type: 3}
diff --git a/Assets/Prefabs/Core.prefab b/Assets/Prefabs/Core.prefab
index a86708d..cfa7314 100644
--- a/Assets/Prefabs/Core.prefab
+++ b/Assets/Prefabs/Core.prefab
@@ -49,7 +49,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject
-  GlobalObjectIdHash: 615747208
+  GlobalObjectIdHash: 3998537868
   InScenePlacedSourceGlobalObjectIdHash: 615747208
   DeferredDespawnTick: 0
   Ownership: 0
@@ -106,7 +106,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.Building
   ShowTopMostFoldoutHeaderGroup: 1
-  buildingData: {fileID: 11400000, guid: 0e495d169ee3bce449f4b1aea83d6818, type: 2}
+  buildingData: {fileID: 0}
   gridPosition: {x: 0, y: 0, z: 0}
   rotation: 0
   initialTeam: 1
@@ -134,12 +134,12 @@ BoxCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
   m_Size: {x: 8, y: 8, z: 8}
-  m_Center: {x: 0, y: 5, z: 0}
+  m_Center: {x: 0, y: 4, z: 0}
 --- !u!114 &-7963177287827765112
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -231,10 +231,40 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 0402c4b1e07c04444b61bea1d63d7880, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 8929210192865157768}
   m_SourcePrefab: {fileID: 100100000, guid: 0402c4b1e07c04444b61bea1d63d7880, type: 3}
 --- !u!4 &1630774755871243086 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0402c4b1e07c04444b61bea1d63d7880, type: 3}
   m_PrefabInstance: {fileID: 1237105051606736037}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2155673551667028468 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0402c4b1e07c04444b61bea1d63d7880, type: 3}
+  m_PrefabInstance: {fileID: 1237105051606736037}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &8929210192865157768
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2155673551667028468}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 2107252493709494298, guid: 0402c4b1e07c04444b61bea1d63d7880, type: 3}
diff --git a/Assets/Prefabs/Creep/Creep1.prefab b/Assets/Prefabs/Creep/Creep1.prefab
index 5ed178a..9838477 100644
--- a/Assets/Prefabs/Creep/Creep1.prefab
+++ b/Assets/Prefabs/Creep/Creep1.prefab
@@ -1019,7 +1019,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyAIController
   ShowTopMostFoldoutHeaderGroup: 1
   aiType: 2
-  detectionRange: 15
+  detectionRange: 6
   detectionAngle: 360
   playerLayer:
     serializedVersion: 2
diff --git a/Assets/Prefabs/Monster/Monster101.prefab b/Assets/Prefabs/Monster/Monster101.prefab
index ddcb82b..8cd684a 100644
--- a/Assets/Prefabs/Monster/Monster101.prefab
+++ b/Assets/Prefabs/Monster/Monster101.prefab
@@ -1353,7 +1353,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyAIController
   ShowTopMostFoldoutHeaderGroup: 1
   aiType: 3
-  detectionRange: 15
+  detectionRange: 6
   detectionAngle: 360
   playerLayer:
     serializedVersion: 2
diff --git a/Assets/Prefabs/Monster/Monster102.prefab b/Assets/Prefabs/Monster/Monster102.prefab
index 870ffca..119dd72 100644
--- a/Assets/Prefabs/Monster/Monster102.prefab
+++ b/Assets/Prefabs/Monster/Monster102.prefab
@@ -1777,7 +1777,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyAIController
   ShowTopMostFoldoutHeaderGroup: 1
   aiType: 3
-  detectionRange: 15
+  detectionRange: 6
   detectionAngle: 360
   playerLayer:
     serializedVersion: 2
diff --git a/Assets/Prefabs/Monster/Monster103.prefab b/Assets/Prefabs/Monster/Monster103.prefab
index f490d6e..637f0bd 100644
--- a/Assets/Prefabs/Monster/Monster103.prefab
+++ b/Assets/Prefabs/Monster/Monster103.prefab
@@ -699,7 +699,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyAIController
   ShowTopMostFoldoutHeaderGroup: 1
   aiType: 3
-  detectionRange: 15
+  detectionRange: 6
   detectionAngle: 360
   playerLayer:
     serializedVersion: 2
diff --git a/Assets/Prefabs/Monster/Monster104.prefab b/Assets/Prefabs/Monster/Monster104.prefab
index a756a53..460505c 100644
--- a/Assets/Prefabs/Monster/Monster104.prefab
+++ b/Assets/Prefabs/Monster/Monster104.prefab
@@ -1132,7 +1132,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyAIController
   ShowTopMostFoldoutHeaderGroup: 1
   aiType: 3
-  detectionRange: 15
+  detectionRange: 6
   detectionAngle: 360
   playerLayer:
     serializedVersion: 2
diff --git a/Assets/Prefabs/Monster/Monster105.prefab b/Assets/Prefabs/Monster/Monster105.prefab
index bfa2e0d..ba736e9 100644
--- a/Assets/Prefabs/Monster/Monster105.prefab
+++ b/Assets/Prefabs/Monster/Monster105.prefab
@@ -1377,7 +1377,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyAIController
   ShowTopMostFoldoutHeaderGroup: 1
   aiType: 3
-  detectionRange: 15
+  detectionRange: 6
   detectionAngle: 360
   playerLayer:
     serializedVersion: 2
diff --git a/Assets/Prefabs/Worker Hall.prefab b/Assets/Prefabs/Worker Hall.prefab
index af428d0..146b2a4 100644
--- a/Assets/Prefabs/Worker Hall.prefab	
+++ b/Assets/Prefabs/Worker Hall.prefab	
@@ -79,7 +79,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject
-  GlobalObjectIdHash: 106047719
+  GlobalObjectIdHash: 1153289458
   InScenePlacedSourceGlobalObjectIdHash: 106047719
   DeferredDespawnTick: 0
   Ownership: 0
@@ -129,7 +129,7 @@ BoxCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
@@ -198,8 +198,38 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 56468d9a489c9b544967ef6660b1f310, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6473738761679328420}
   m_SourcePrefab: {fileID: 100100000, guid: 56468d9a489c9b544967ef6660b1f310, type: 3}
+--- !u!1 &7383998074027417935 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 56468d9a489c9b544967ef6660b1f310, type: 3}
+  m_PrefabInstance: {fileID: 7689987561806076958}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &6473738761679328420
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7383998074027417935}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 620831340745236588, guid: 56468d9a489c9b544967ef6660b1f310, type: 3}
 --- !u!4 &7868610488888916981 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 56468d9a489c9b544967ef6660b1f310, type: 3}
diff --git a/Assets/Scenes/GameMain.unity b/Assets/Scenes/GameMain.unity
index 73488ca..967f5c6 100644
--- a/Assets/Scenes/GameMain.unity
+++ b/Assets/Scenes/GameMain.unity
@@ -987,8 +987,8 @@ MonoBehaviour:
   minResourceCount: 8
   maxResourceCount: 12
   minDistanceBetweenResources: 80
-  minDistanceFromCore: 30
-  minDistanceFromBarracks: 30
+  minDistanceFromCore: 40
+  minDistanceFromBarracks: 40
   initialResourceProduction: 50
   additionalResourceBaseProduction: 25
   targetTotalProduction: 300
@@ -1589,7 +1589,7 @@ MeshCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 5
-  m_Convex: 1
+  m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 7871226766641542135, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3}
 --- !u!114 &985764489
@@ -3027,10 +3027,6 @@ PrefabInstance:
       propertyPath: GlobalObjectIdHash
       value: 1738409839
       objectReference: {fileID: 0}
-    - target: {fileID: 8736618315465008189, guid: 368961a0f2d71ce4aad5d8ffe52e0b7f, type: 3}
-      propertyPath: InScenePlacedSourceGlobalObjectIdHash
-      value: 3845453594
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -3371,14 +3367,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 576429380}
     m_Modifications:
-    - target: {fileID: 2236804103334722056, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3}
-      propertyPath: m_Center.y
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 2964705630284685173, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3}
-      propertyPath: buildingData
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 5173262576415873253, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3}
       propertyPath: GlobalObjectIdHash
       value: 3998537868
diff --git a/Assets/Scenes/GameMain/NavMesh-Primitive_Floor.asset b/Assets/Scenes/GameMain/NavMesh-Primitive_Floor.asset
index 4568990..f771691 100644
Binary files a/Assets/Scenes/GameMain/NavMesh-Primitive_Floor.asset and b/Assets/Scenes/GameMain/NavMesh-Primitive_Floor.asset differ