diff --git a/helotraining_mp.Altis/createDropoffLZ.sqf b/helotraining_mp.Altis/createDropoffLZ.sqf
index 8618825..7c431a8 100644
--- a/helotraining_mp.Altis/createDropoffLZ.sqf
+++ b/helotraining_mp.Altis/createDropoffLZ.sqf
@@ -43,11 +43,11 @@ if (!_lzAA and _lzhot) then
 _longdesc = _longdesc + format["<br/>Created for %1", _assignToPlayer];
 private _assignTo = [_assignToPlayer, west];
 
-// PONDER: make a parent task "ferry squad X" ??
 private _taskid = format["dropoff_%1", lzCounter];
-[_assignTo,[_taskid],[_longdesc, _shortdesc, _shortestDesc],getPos _lzLocation,"AUTOASSIGNED",(STARTPRIORITY-lzCounter),true, _taskType, true] call BIS_fnc_taskCreate;
-// Doesn't actually assign the task, maybe we need to remoteExec this (though it should still work for me as host and it doesn't...)
-_assignToPlayer setCurrentTask ([_taskid,_assignToPlayer] call BIS_fnc_taskReal);
+// Create the task for everyone
+[_assignTo,[_taskid],[_longdesc, _shortdesc, _shortestDesc],getPos _lzLocation,"CREATED",(STARTPRIORITY-lzCounter),true, _taskType, true] call BIS_fnc_taskCreate;
+// Assign to the player
+[[_assignToPlayer],[_taskid],[_longdesc, _shortdesc, _shortestDesc],getPos _lzLocation,"ASSIGNED",(STARTPRIORITY-lzCounter),true, _taskType, true] call BIS_fnc_setTask;
 
 private _trg = createTrigger["EmptyDetector",getPos _lzLocation, false];
 _trg setTriggerArea[lzSize,lzSize,0,false];
diff --git a/helotraining_mp.Altis/createPickupLZ.sqf b/helotraining_mp.Altis/createPickupLZ.sqf
index 8acd2aa..97f057a 100644
--- a/helotraining_mp.Altis/createPickupLZ.sqf
+++ b/helotraining_mp.Altis/createPickupLZ.sqf
@@ -53,7 +53,7 @@ if (!(_assignExtra isEqualTo false)) then
 {
     _longdesc = _longdesc + format["<br/>Created for %1", _assignExtra];
     _assignTo = _assignTo + _assignExtra;
-//    _taskState = "CREATED";
+    _taskState = "CREATED";
 };
 
 
@@ -61,12 +61,9 @@ if (!(_assignExtra isEqualTo false)) then
 // PONDER: make a parent task "ferry squad X" ??
 private _taskid = format["pickup_%1", lzCounter];
 [_assignTo,[_taskid],[_longdesc, _shortdesc, _shortestDesc],getPos _lzLocation,_taskState,(STARTPRIORITY-lzCounter),true, _taskType, true] call BIS_fnc_taskCreate;
-// Doesn't actually assign the task, maybe we need to remoteExec this (though it should still work for me as host and it doesn't...)
 if (!(_assignExtra isEqualTo false)) then
 {
-    {
-        _x setCurrentTask ([_taskid,_x] call BIS_fnc_taskReal);
-    } forEach _assignExtra;
+    [_assignExtra,[_taskid],[_longdesc, _shortdesc, _shortestDesc],getPos _lzLocation,"ASSIGNED",(STARTPRIORITY-lzCounter),true, _taskType, true] call BIS_fnc_setTask;
 };
 
 if (bSmoke) then