diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf
index 76a1af3..80ab0ca 100644
--- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf
+++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf
@@ -186,7 +186,12 @@ for "_i" from 1 to (count blck_activeMissionsList) do
 
 				if !(_scubaGroupParameters isEqualTo []) then 
 				{
-					_temp = [_coords, _minNoAI,_maxNoAI,_noAIGroups,_scubaGroupParameters,_difficulty,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms,_isScubaMission] call blck_fnc_spawnMissionAI;
+					//_umsUniforms = blck_UMS_uniforms;
+					//_umsHeadgear = blck_UMS_headgear;
+					//_umsWeapons = blck_UMS_weapons;
+					//_umsVests = blck_UMS_vests;
+					
+					_temp = [_coords, _minNoAI,_maxNoAI,_noAIGroups,_scubaGroupParameters,_difficulty,blck_UMS_uniforms,blck_UMS_headgear,blck_UMS_vests,_backpacks,blck_UMS_weapons,_sideArms,true] call blck_fnc_spawnMissionAI;
 					_temp params["_ai","_abort"];
 					if (_abort) throw 1;
 					_blck_AllMissionAI append (_ai);
diff --git a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf
index cff28fd..4aabac8 100644
--- a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf
+++ b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf
@@ -63,7 +63,13 @@ if (_scuba) then
 _skin = "";
 _counter = 1;
 
-_unit forceAddUniform (selectRandom _uniforms);
+if (surfaceIsWater (getPos _unit)) then 
+{
+	_uniforms = blck_UMS_uniforms;
+	_headGear = blck_UMS_headgear;
+	_weaponList = blck_UMS_weapons;
+	_vests = blck_UMS_vests;
+};
  
 //Sets AI Tactics
 _unit enableAI "ALL";