diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua
index ade7a87c6..f4a72b000 100644
--- a/Moose Development/Moose/Ops/Auftrag.lua	
+++ b/Moose Development/Moose/Ops/Auftrag.lua	
@@ -1308,7 +1308,7 @@ function AUFTRAG:NewCAP(ZoneCAP, Altitude, Speed, Coordinate, Heading, Leg, Targ
   end
 
   -- Create ORBIT first.
-  local mission=AUFTRAG:NewORBIT(Coordinate or ZoneCAP:GetCoordinate(), Altitude or 10000, Speed, Heading, Leg)
+  local mission=AUFTRAG:NewORBIT(Coordinate or ZoneCAP:GetCoordinate(), Altitude or 10000, Speed or 350, Heading, Leg)
 
   -- Mission type CAP.
   mission.type=AUFTRAG.Type.CAP
@@ -1322,6 +1322,7 @@ function AUFTRAG:NewCAP(ZoneCAP, Altitude, Speed, Coordinate, Heading, Leg, Targ
   mission.missionTask=ENUMS.MissionTask.CAP
   mission.optionROE=ENUMS.ROE.OpenFire
   mission.optionROT=ENUMS.ROT.EvadeFire
+  mission.missionSpeed = UTILS.KnotsToAltKIAS(Speed,Altitude)
 
   mission.categories={AUFTRAG.Category.AIRCRAFT}
 
diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua
index 6bcfcd5d1..f0b6f1bd7 100644
--- a/Moose Development/Moose/Ops/FlightGroup.lua	
+++ b/Moose Development/Moose/Ops/FlightGroup.lua	
@@ -3773,9 +3773,16 @@ function FLIGHTGROUP:AddWaypoint(Coordinate, Speed, AfterWaypointWithID, Altitud
 
   -- Set waypoint index.
   local wpnumber=self:GetWaypointIndexAfterID(AfterWaypointWithID)
-
+ 
   -- Speed in knots.
-  Speed=Speed or self:GetSpeedCruise()
+  if not Speed or Speed < 10 then 
+  
+  local mission = self:GetMissionCurrent() -- Ops.Auftrag#AUFTRAG
+  local speed = mission.missionSpeed 
+  Speed = speed or self:GetSpeedCruise() 
+  
+  end
+  --Speed=Speed or self:GetSpeedCruise()
   
   -- Alt type default is barometric (ASL). For helos we use radar (AGL).
   local alttype=COORDINATE.WaypointAltType.BARO
diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua
index 7fddf424d..2cd2f8e12 100644
--- a/Moose Development/Moose/Ops/OpsGroup.lua	
+++ b/Moose Development/Moose/Ops/OpsGroup.lua	
@@ -3213,8 +3213,10 @@ end
 function OPSGROUP:GetExpectedSpeed()
 
   if self:IsHolding() or self:Is("Rearming") or self:IsWaiting() or self:IsRetreated() then
+    --env.info("GetExpectedSpeed - returning ZERO")
     return 0
   else
+    --env.info("GetExpectedSpeed - returning self.speedWP = "..self.speedWp)
     return self.speedWp or 0
   end