diff --git a/main/navmeshes/NavEditor/GoldsrcNavEditor.exe b/main/navmeshes/NavEditor/GoldsrcNavEditor.exe
index a05ed7a3..54dfb43d 100644
Binary files a/main/navmeshes/NavEditor/GoldsrcNavEditor.exe and b/main/navmeshes/NavEditor/GoldsrcNavEditor.exe differ
diff --git a/main/navmeshes/ns_altair.nav b/main/navmeshes/ns_altair.nav
index c6ea3204..3e5384ad 100644
Binary files a/main/navmeshes/ns_altair.nav and b/main/navmeshes/ns_altair.nav differ
diff --git a/main/navmeshes/ns_askr_b6.nav b/main/navmeshes/ns_askr_b6.nav
index e90b148a..c9c63d9e 100644
Binary files a/main/navmeshes/ns_askr_b6.nav and b/main/navmeshes/ns_askr_b6.nav differ
diff --git a/main/navmeshes/ns_ayumi.nav b/main/navmeshes/ns_ayumi.nav
index c24ed959..a55c09f7 100644
Binary files a/main/navmeshes/ns_ayumi.nav and b/main/navmeshes/ns_ayumi.nav differ
diff --git a/main/navmeshes/ns_bast.nav b/main/navmeshes/ns_bast.nav
index c764cbb7..2f5d45e2 100644
Binary files a/main/navmeshes/ns_bast.nav and b/main/navmeshes/ns_bast.nav differ
diff --git a/main/navmeshes/ns_caged.nav b/main/navmeshes/ns_caged.nav
index 6273ab0e..e040de76 100644
Binary files a/main/navmeshes/ns_caged.nav and b/main/navmeshes/ns_caged.nav differ
diff --git a/main/navmeshes/ns_eclipse.nav b/main/navmeshes/ns_eclipse.nav
index ea3f6064..7a996a1b 100644
Binary files a/main/navmeshes/ns_eclipse.nav and b/main/navmeshes/ns_eclipse.nav differ
diff --git a/main/navmeshes/ns_eon.nav b/main/navmeshes/ns_eon.nav
index 8050e4b3..af68ede3 100644
Binary files a/main/navmeshes/ns_eon.nav and b/main/navmeshes/ns_eon.nav differ
diff --git a/main/navmeshes/ns_hera.nav b/main/navmeshes/ns_hera.nav
index 8c41a2b5..6122bf72 100644
Binary files a/main/navmeshes/ns_hera.nav and b/main/navmeshes/ns_hera.nav differ
diff --git a/main/navmeshes/ns_lost.nav b/main/navmeshes/ns_lost.nav
index faa7ec22..caebb49a 100644
Binary files a/main/navmeshes/ns_lost.nav and b/main/navmeshes/ns_lost.nav differ
diff --git a/main/navmeshes/ns_lucid.nav b/main/navmeshes/ns_lucid.nav
index cda8c656..3faee441 100644
Binary files a/main/navmeshes/ns_lucid.nav and b/main/navmeshes/ns_lucid.nav differ
diff --git a/main/navmeshes/ns_machina.nav b/main/navmeshes/ns_machina.nav
index b08b78ac..8049374c 100644
Binary files a/main/navmeshes/ns_machina.nav and b/main/navmeshes/ns_machina.nav differ
diff --git a/main/navmeshes/ns_metal.nav b/main/navmeshes/ns_metal.nav
index 82b04896..4d4956df 100644
Binary files a/main/navmeshes/ns_metal.nav and b/main/navmeshes/ns_metal.nav differ
diff --git a/main/navmeshes/ns_nancy.nav b/main/navmeshes/ns_nancy.nav
index 415ccd08..f6317749 100644
Binary files a/main/navmeshes/ns_nancy.nav and b/main/navmeshes/ns_nancy.nav differ
diff --git a/main/navmeshes/ns_nothing.nav b/main/navmeshes/ns_nothing.nav
index 1f249d5d..e39f1b8a 100644
Binary files a/main/navmeshes/ns_nothing.nav and b/main/navmeshes/ns_nothing.nav differ
diff --git a/main/navmeshes/ns_origin.nav b/main/navmeshes/ns_origin.nav
index 33c13528..0b256b5c 100644
Binary files a/main/navmeshes/ns_origin.nav and b/main/navmeshes/ns_origin.nav differ
diff --git a/main/navmeshes/ns_ragnarok.nav b/main/navmeshes/ns_ragnarok.nav
index dfaf4c21..29d2b2fc 100644
Binary files a/main/navmeshes/ns_ragnarok.nav and b/main/navmeshes/ns_ragnarok.nav differ
diff --git a/main/navmeshes/ns_shiva.nav b/main/navmeshes/ns_shiva.nav
index 50a5f799..6c0f82fb 100644
Binary files a/main/navmeshes/ns_shiva.nav and b/main/navmeshes/ns_shiva.nav differ
diff --git a/main/navmeshes/ns_tanith.nav b/main/navmeshes/ns_tanith.nav
index 5b2a1ef0..b666b4a1 100644
Binary files a/main/navmeshes/ns_tanith.nav and b/main/navmeshes/ns_tanith.nav differ
diff --git a/main/navmeshes/ns_veil.nav b/main/navmeshes/ns_veil.nav
index 2393cc50..caa98002 100644
Binary files a/main/navmeshes/ns_veil.nav and b/main/navmeshes/ns_veil.nav differ
diff --git a/main/source/mod/AvHAICommander.cpp b/main/source/mod/AvHAICommander.cpp
index c8cb052b..e1e35ed6 100644
--- a/main/source/mod/AvHAICommander.cpp
+++ b/main/source/mod/AvHAICommander.cpp
@@ -1172,7 +1172,7 @@ bool AICOMM_CheckForNextBuildAction(AvHAIPlayer* pBot)
 
 	if (!TF.IsValid())
 	{
-		Vector BuildLocation = AITAC_GetRandomBuildHintInLocation(STRUCTURE_MARINE_TURRETFACTORY, CommChair->v.origin, UTIL_MetresToGoldSrcUnits(10.0f));
+		Vector BuildLocation = AITAC_GetRandomBuildHintInLocation(STRUCTURE_MARINE_TURRETFACTORY, CommChair->v.origin, UTIL_MetresToGoldSrcUnits(20.0f));
 
 		if (!vIsZero(BuildLocation))
 		{
@@ -1247,7 +1247,7 @@ bool AICOMM_CheckForNextBuildAction(AvHAIPlayer* pBot)
 
 	if (!bHasArmsLab && !FNullEnt(BaseBuilder))
 	{
-		Vector BuildLocation = AITAC_GetRandomBuildHintInLocation(STRUCTURE_MARINE_ARMSLAB, CommChair->v.origin, UTIL_MetresToGoldSrcUnits(15.0f));
+		Vector BuildLocation = AITAC_GetRandomBuildHintInLocation(STRUCTURE_MARINE_ARMSLAB, CommChair->v.origin, UTIL_MetresToGoldSrcUnits(20.0f));
 
 		if (!vIsZero(BuildLocation))
 		{
@@ -1281,7 +1281,7 @@ bool AICOMM_CheckForNextBuildAction(AvHAIPlayer* pBot)
 
 	if (!bHasObservatory && !FNullEnt(BaseBuilder))
 	{
-		Vector BuildLocation = AITAC_GetRandomBuildHintInLocation(STRUCTURE_MARINE_OBSERVATORY, CommChair->v.origin, UTIL_MetresToGoldSrcUnits(15.0f));
+		Vector BuildLocation = AITAC_GetRandomBuildHintInLocation(STRUCTURE_MARINE_OBSERVATORY, CommChair->v.origin, UTIL_MetresToGoldSrcUnits(20.0f));
 
 		if (!vIsZero(BuildLocation))
 		{
@@ -1361,7 +1361,7 @@ bool AICOMM_CheckForNextBuildAction(AvHAIPlayer* pBot)
 
 	if (!bHasPrototypeLab && bHasAdvArmoury && !FNullEnt(BaseBuilder))
 	{
-		Vector BuildLocation = AITAC_GetRandomBuildHintInLocation(STRUCTURE_MARINE_PROTOTYPELAB, CommChair->v.origin, UTIL_MetresToGoldSrcUnits(15.0f));
+		Vector BuildLocation = AITAC_GetRandomBuildHintInLocation(STRUCTURE_MARINE_PROTOTYPELAB, CommChair->v.origin, UTIL_MetresToGoldSrcUnits(20.0f));
 		
 		if(!vIsZero(BuildLocation))
 		{