diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua
index beeaa9fff..8167b5327 100644
--- a/Moose Development/Moose/Wrapper/Controllable.lua	
+++ b/Moose Development/Moose/Wrapper/Controllable.lua	
@@ -62,6 +62,7 @@
 --   * @{#CONTROLLABLE.TaskOrbitCircle}: (AIR) Orbit at the current position of the first unit of the controllable at a specified altitude.
 --   * @{#CONTROLLABLE.TaskOrbitCircleAtVec2}: (AIR) Orbit at a specified position at a specified altitude during a specified duration with a specified speed.
 --   * @{#CONTROLLABLE.TaskRefueling}: (AIR) Refueling from the nearest tanker. No parameters.
+--   * @{#CONTROLLABLE.TaskRecoveryTanker}: (AIR) Set  group to act as recovery tanker for a naval group.
 --   * @{#CONTROLLABLE.TaskRoute}: (AIR + GROUND) Return a Mission task to follow a given route defined by Points.
 --   * @{#CONTROLLABLE.TaskRouteToVec2}: (AIR + GROUND) Make the Controllable move to a given point.
 --   * @{#CONTROLLABLE.TaskRouteToVec3}: (AIR + GROUND) Make the Controllable move to a given point.
@@ -1259,7 +1260,7 @@ end
 
 --- (AIR) Orbit at a position with at a given altitude and speed. Optionally, a race track pattern can be specified.
 -- @param #CONTROLLABLE self
--- @param Core.Point#COORDINATE Coord Coordinate at which the CONTROLLABLE orbits. Can also be given as a `DCS#Vec3` or `DCS#Vec2` object.
+-- @param Core.Point#COORDINATE Coord Coordinate at which the CONTROLLABLE orbits.
 -- @param #number Altitude Altitude in meters of the orbit pattern. Default y component of Coord.
 -- @param #number Speed Speed [m/s] flying the orbit pattern. Default 128 m/s = 250 knots.
 -- @param Core.Point#COORDINATE CoordRaceTrack (Optional) If this coordinate is specified, the CONTROLLABLE will fly a race-track pattern using this and the initial coordinate.
@@ -1268,11 +1269,11 @@ function CONTROLLABLE:TaskOrbit( Coord, Altitude, Speed, CoordRaceTrack )
 
   local Pattern = AI.Task.OrbitPattern.CIRCLE
 
-  local P1 = {x=Coord.x, y=Coord.z or Coord.y}
+  local P1 = Coord:GetVec2()
   local P2 = nil
   if CoordRaceTrack then
     Pattern = AI.Task.OrbitPattern.RACE_TRACK
-    P2 = {x=CoordRaceTrack.x, y=CoordRaceTrack.z or CoordRaceTrack.y}
+    P2 = CoordRaceTrack:GetVec2()
   end
 
   local Task = {
@@ -1367,6 +1368,31 @@ function CONTROLLABLE:TaskRefueling()
   return DCSTask
 end
 
+--- (AIR) Act as Recovery Tanker for a naval/carrier group.
+-- @param #CONTROLLABLE self
+-- @param Wrapper.Group#GROUP CarrierGroup
+-- @param #number Speed Speed in meters per second
+-- @param #number Altitude Altitude the tanker orbits at in meters
+-- @param #number LastWptNumber (optional) Waypoint of carrier group that when reached, ends the recovery tanker task
+-- @return DCS#Task The DCS task structure.
+function CONTROLLABLE:TaskRecoveryTanker(CarrierGroup, Speed, Altitude, LastWptNumber)
+  
+  local LastWptFlag = type(LastWptNumber) == "number" and true or false
+  
+  local DCSTask = { 
+   id = "RecoveryTanker",
+   params = {
+       groupId = CarrierGroup:GetID(),
+       speed = Speed, 
+       altitude = Altitude, 
+       lastWptIndexFlag = LastWptFlag, 
+       lastWptIndex = LastWptNumber
+      }
+    }
+  
+  return DCSTask
+end
+
 --- (AIR HELICOPTER) Landing at the ground. For helicopters only.
 -- @param #CONTROLLABLE self
 -- @param DCS#Vec2 Vec2 The point where to land.
@@ -3928,4 +3954,4 @@ function CONTROLLABLE:SetAltitude(Altitude, Keep, AltType)
     end
   end
   return self
-end
\ No newline at end of file
+end
diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua
index c0cb7e31e..66a67d428 100644
--- a/Moose Development/Moose/Wrapper/Group.lua	
+++ b/Moose Development/Moose/Wrapper/Group.lua	
@@ -2855,3 +2855,27 @@ function GROUP:GetCustomCallSign(ShortCallsign,Keepnumber,CallsignTranslations)
   
   return callsign
 end
+
+---
+-- @param #GROUP self
+-- @param Wrapper.Group#GROUP CarrierGroup.
+-- @param #number Speed Speed in knots.
+-- @param #boolean ToKIAS If true, adjust speed to altitude (KIAS).
+-- @param #number Altitude Altitude the tanker orbits at in feet.
+-- @param #number Delay (optional) Set the task after this many seconds. Defaults to one.
+-- @param #number LastWaypoint (optional) Waypoint number of carrier group that when reached, ends the recovery tanker task.
+-- @return #GROUP self
+function GROUP:SetAsRecoveryTanker(CarrierGroup,Speed,ToKIAS,Altitude,Delay,LastWaypoint)
+  
+  local speed = ToKIAS == true and UTILS.KnotsToAltKIAS(Speed,Altitude) or Speed
+  speed = UTILS.KnotsToMps(speed)
+  
+  local alt = UTILS.FeetToMeters(Altitude)
+  local delay = Delay or 1
+  
+  local task = self:TaskRecoveryTanker(CarrierGroup,speed,alt,LastWaypoint)
+
+  self:SetTask(task,delay)
+  
+  return self  
+end