diff --git a/@epochhive/addons/custom_server/Compiles/Groups/GMS_fnc_setWaypoints.sqf b/@epochhive/addons/custom_server/Compiles/Groups/GMS_fnc_setWaypoints.sqf
index 3c67c7a..32d8530 100644
--- a/@epochhive/addons/custom_server/Compiles/Groups/GMS_fnc_setWaypoints.sqf
+++ b/@epochhive/addons/custom_server/Compiles/Groups/GMS_fnc_setWaypoints.sqf
@@ -3,7 +3,7 @@
 	for DBD Clan
 	By Ghostrider-DBD-
 	Copyright 2016
-	Last modified 3/22/17
+	Last modified 3/17/17
 	
 	--------------------------
 	License
@@ -16,7 +16,7 @@
 
 
 private["_dir","_arc","_noWp","_newpos","_wpradius","_wp"];
-params["_pos","_minDis","_maxDis","_group",["_mode","random"],["_pattern",["MOVE","SAD"]]];
+params["_pos","_minDis","_maxDis","_group",["_mode","random"],["_patrolMode","SAD"]];
 
 /*
 _pos = _this select 0; // center of the patrol area
@@ -33,8 +33,6 @@ _group setVariable["timeStamp",diag_tickTime];
 _group setVariable["arc",0];
 _group setVariable["wpRadius",30];
 _group setVariable["wpMode",_mode];
-_group setVariable["wpPattern",_pattern];
-_group setVariable["wpIndex",0];
 
 _dir = 0;
 _arc = 30;
@@ -47,12 +45,12 @@ _wp = [_group, 0];
 _wp setWaypointType "MOVE";
 _wp setWaypointName "move";
 _wp setWaypointTimeout [1,1.1,1.2];
-_wp setWaypointStatements ["true","this call blck_fnc_setNextWaypoint;diag_log format['====Updating waypoint to for group %1',group this];"];
+_wp setWaypointStatements ["true","this call blck_fnc_changeToSADWaypoint;diag_log format['====Updating waypoint to SAD for group %1',group this];"];
 #else
 _wp setWaypointType "SAD";
 _wp setWaypointName "sad";
 _wp setWaypointTimeout [20,25,30];
-_wp setWaypointStatements ["true","this call blck_fnc_setNextWaypoint;diag_log format['====Updating waypointfor group %1',group this];"];
+_wp setWaypointStatements ["true","this call blck_fnc_changeToMoveWaypoint;diag_log format['====Updating waypoint to Move for group %1',group this];"];
 #endif
 
 _wp setWaypointBehaviour "COMBAT";
diff --git a/@epochhive/addons/custom_server/Compiles/Groups/GMS_fnc_spawnGroup.sqf b/@epochhive/addons/custom_server/Compiles/Groups/GMS_fnc_spawnGroup.sqf
index dbd644d..9a61255 100644
--- a/@epochhive/addons/custom_server/Compiles/Groups/GMS_fnc_spawnGroup.sqf
+++ b/@epochhive/addons/custom_server/Compiles/Groups/GMS_fnc_spawnGroup.sqf
@@ -81,7 +81,7 @@ if !(isNull _groupSpawned) then
 	};
 	_groupSpawned selectLeader (units _groupSpawned select 0);
 	// params["_pos","_minDis","_maxDis","_group",["_mode","random"],["_pattern",["MOVE","SAD"]]];
-	[_pos,_minDist,_maxDist,_groupSpawned,"random",["SAD"]] spawn blck_fnc_setupWaypoints;
+	[_pos,_minDist,_maxDist,_groupSpawned,"random",["MOVE","SAD"]] spawn blck_fnc_setupWaypoints;
 
 	#ifdef blck_debugMode
 	if (blck_debugLevel > 2) then
diff --git a/@epochhive/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnMissionHeli.sqf b/@epochhive/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnMissionHeli.sqf
index 932718a..27e2c02 100644
--- a/@epochhive/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnMissionHeli.sqf
+++ b/@epochhive/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnMissionHeli.sqf
@@ -159,17 +159,17 @@ if !(isNull _grpPilot)  then
 	};
 	//set waypoint for helicopter
 	// params["_pos","_minDis","_maxDis","_group",["_mode","random"],["_pattern",["MOVE","SAD"]]];
-	[_coords,2,10,_grpPilot,"random",["SENTRY"]] call blck_fnc_setupWaypoints;
+	//[_coords,2,10,_grpPilot,"random",["MOVE","SENTRY"]] call blck_fnc_setupWaypoints;
 	private["_wpDestination"];
-	/*
+	
 	[_grpPilot, 0] setWPPos _coords; 
 	[_grpPilot, 0] setWaypointType "SAD";
 	[_grpPilot, 0] setWaypointSpeed "NORMAL";
 	[_grpPilot, 0] setWaypointBehaviour "CARELESS";
 	[_grpPilot, 0] setWaypointStatements ["true","[group this, 0] setCurrentWaypoint [group this,0];"];
-	[_grpPilot,0] setWaypointTimeout [100,150,200];
+	[_grpPilot,0] setWaypointTimeout [10000,15000,20000];
 	_grpPilot setCurrentWaypoint [_grpPilot,0];
-	*/
+	
 	#ifdef blck_debugMode
 	if (blck_debugLevel > 2) then
 	{
diff --git a/@epochhive/addons/custom_server/init/build.sqf b/@epochhive/addons/custom_server/init/build.sqf
index 7fa3965..4c79868 100644
--- a/@epochhive/addons/custom_server/init/build.sqf
+++ b/@epochhive/addons/custom_server/init/build.sqf
@@ -1,3 +1,3 @@
 private ["_version","_versionDate"];
-_blck_version = "6.58 Build 46";
-_blck_versionDate = "3-22-17  8:00 PM";
+_blck_version = "6.58 Build 47";
+_blck_versionDate = "3-23-17  8:00 AM";