diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua
index b18fbb93b..2ec378641 100644
--- a/Moose Development/Moose/Ops/CSAR.lua	
+++ b/Moose Development/Moose/Ops/CSAR.lua	
@@ -22,7 +22,7 @@
 -- @module Ops.CSAR
 -- @image OPS_CSAR.jpg
 
--- Date: July 2021
+-- Date: Aug 2021
 
 -------------------------------------------------------------------------
 --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM
@@ -69,6 +69,7 @@
 --
 --         self.allowDownedPilotCAcontrol = false -- Set to false if you don\'t want to allow control by Combined Arms.
 --         self.allowFARPRescue = true -- allows pilots to be rescued by landing at a FARP or Airbase. Else MASH only!
+--         self.FARPRescueDistance = 1000 -- you need to be this close to a FARP or Airport for the pilot to be rescued.
 --         self.autosmoke = false -- automatically smoke a downed pilot\'s location when a heli is near.
 --         self.autosmokedistance = 1000 -- distance for autosmoke
 --         self.coordtype = 1 -- Use Lat/Long DDM (0), Lat/Long DMS (1), MGRS (2), Bullseye imperial (3) or Bullseye metric (4) for coordinates.
@@ -232,7 +233,7 @@ CSAR.AircraftType["Mi-24V"] = 8
 
 --- CSAR class version.
 -- @field #string version
-CSAR.version="0.1.9r1"
+CSAR.version="0.1.10r3"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -342,6 +343,7 @@ function CSAR:New(Coalition, Template, Alias)
   self.loadtimemax = 135 -- seconds
   self.radioSound = "beacon.ogg" -- the name of the sound file to use for the Pilot radio beacons. If this isnt added to the mission BEACONS WONT WORK!
   self.allowFARPRescue = true --allows pilot to be rescued by landing at a FARP or Airbase
+  self.FARPRescueDistance = 1000 -- you need to be this close to a FARP or Airport for the pilot to be rescued.
   self.max_units = 6 --max number of pilots that can be carried
   self.useprefix = true  -- Use the Prefixed defined below, Requires Unit have the Prefix defined below 
   self.csarPrefix = { "helicargo", "MEDEVAC"} -- prefixes used for useprefix=true - DON\'T use # in names!
@@ -875,11 +877,14 @@ function CSAR:_EventHandler(EventData)
           end
    
           if _place:GetCoalition() == self.coalition or _place:GetCoalition() == coalition.side.NEUTRAL then
+            self:_ScheduledSARFlight(_event.IniUnitName,_event.IniGroupName,true)
+            --[[
             if self.pilotmustopendoors and not self:_IsLoadingDoorOpen(_event.IniUnitName) then
               self:_DisplayMessageToSAR(_unit, "Open the door to let me out!", self.messageTime, true)
             else
               self:_RescuePilots(_unit)
             end  
+            --]]
           else
               self:T(string.format("Airfield %d, Unit %d", _place:GetCoalition(), _unit:GetCoalition()))
               end
@@ -1298,7 +1303,8 @@ end
 -- @param #CSAR self
 -- @param #string heliname Heli name
 -- @param #string groupname Group name
-function CSAR:_ScheduledSARFlight(heliname,groupname)
+-- @param #boolean isairport If true, EVENT.Landing took place at an airport or FARP
+function CSAR:_ScheduledSARFlight(heliname,groupname, isairport)
   self:T(self.lid .. " _ScheduledSARFlight")
   self:T({heliname,groupname})
   local _heliUnit = self:_GetSARHeli(heliname)
@@ -1321,8 +1327,8 @@ function CSAR:_ScheduledSARFlight(heliname,groupname)
       return
   end
 
-  if _dist < 200 and _heliUnit:InAir() == false then
-    if self.pilotmustopendoors and not self:_IsLoadingDoorOpen(heliname) then
+  if ( _dist < self.FARPRescueDistance or isairport ) and _heliUnit:InAir() == false then
+    if self.pilotmustopendoors and self:_IsLoadingDoorOpen(heliname) == false then
       self:_DisplayMessageToSAR(_heliUnit, "Open the door to let me out!", self.messageTime, true)
     else
       self:_RescuePilots(_heliUnit)
@@ -1331,7 +1337,7 @@ function CSAR:_ScheduledSARFlight(heliname,groupname)
   end
 
   --queue up
-  self:__Returning(-5,heliname,_woundedGroupName)
+  self:__Returning(-5,heliname,_woundedGroupName, isairport)
   return self
 end
 
@@ -1487,10 +1493,17 @@ function CSAR:_GetClosestDownedPilot(_heli)
   local _shortestDistance = -1
   local _distance = 0
   local _closestGroupInfo = nil
-  local _heliCoord = _heli:GetCoordinate()
+  local _heliCoord = _heli:GetCoordinate() or _heli:GetCoordinate()
+  
+  if _heliCoord == nil then 
+    self:E("****Error obtaining coordinate!")
+    return nil 
+  end
   
   local DownedPilotsTable = self.downedPilots
-  for _, _groupInfo in pairs(DownedPilotsTable) do
+  
+  for _, _groupInfo in UTILS.spairs(DownedPilotsTable) do 
+  --for _, _groupInfo in pairs(DownedPilotsTable) do
       local _woundedName = _groupInfo.name
       local _tempWounded = _groupInfo.group
       
@@ -1732,9 +1745,21 @@ end
 function CSAR:_GetDistance(_point1, _point2)
   self:T(self.lid .. " _GetDistance")
   if _point1 and _point2 then
-    local distance = _point1:DistanceFromPointVec2(_point2)
-   return distance
+    local distance1 = _point1:Get2DDistance(_point2)
+    local distance2 = _point1:DistanceFromPointVec2(_point2)
+    self:I({dist1=distance1, dist2=distance2})
+    if distance1 and type(distance1) == "number" then
+      return distance1
+    elseif distance2 and type(distance2) == "number" then
+      return distance2
+    else
+      self:E("*****Cannot calculate distance!")
+      self:E({_point1,_point2})
+      return -1
+    end
   else
+    self:E("******Cannot calculate distance!")
+    self:E({_point1,_point2})
     return -1
   end
 end
@@ -1900,19 +1925,19 @@ end
 -- @param #CSAR self
 function CSAR:_CheckDownedPilotTable()
   local pilots = self.downedPilots
-  for _,_entry in pairs (pilots) do
-    self:T("Checking for " .. _entry.name)
-    self:T({entry=_entry})
-    local group = _entry.group    
-    if not group:IsAlive() then
-      self:T("Group is dead")
-      if _entry.alive == true then
-        self:T("Switching .alive to false")
+  local npilots = {}
+  
+  for _ind,_entry in pairs(pilots) do
+    local _group = _entry.group
+    if _group:IsAlive() then
+      npilots[_ind] = _entry      
+    else
+      if _entry.alive then
         self:__KIA(1,_entry.desc)
-        self:_RemoveNameFromDownedPilots(_entry.name,true)
       end
     end
   end
+  self.downedPilots = npilots
   return self
 end
 
@@ -2032,9 +2057,10 @@ end
 -- @param #string To To state.
 -- @param #string Heliname Name of the helicopter group.
 -- @param #string Woundedgroupname Name of the downed pilot\'s group.
-function CSAR:onbeforeReturning(From, Event, To, Heliname, Woundedgroupname)
+-- @param #boolean IsAirport True if heli has landed on an AFB (from event land).
+function CSAR:onbeforeReturning(From, Event, To, Heliname, Woundedgroupname, IsAirPort)
   self:T({From, Event, To, Heliname, Woundedgroupname})
-  self:_ScheduledSARFlight(Heliname,Woundedgroupname)
+  self:_ScheduledSARFlight(Heliname,Woundedgroupname, IsAirPort)
   return self
 end