diff --git a/Moose Development/Moose/Ops/FlightControl.lua b/Moose Development/Moose/Ops/FlightControl.lua
index 9ea5cdcb0..9a84d5cb3 100644
--- a/Moose Development/Moose/Ops/FlightControl.lua	
+++ b/Moose Development/Moose/Ops/FlightControl.lua	
@@ -756,6 +756,11 @@ function FLIGHTCONTROL:_RemoveFlightFromQueue(queue, flight, queuename)
     if qflight.groupname==flight.groupname then
       self:I(self.lid..string.format("Removing flight group %s from %s queue.", flight.groupname, queuename))
       table.remove(queue, i)
+      
+      if not flight.ai then      
+        flight:_UpdateMenu()
+      end
+      
       return true, i
     end
   end
diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua
index 09c4ce742..9971e3543 100644
--- a/Moose Development/Moose/Ops/FlightGroup.lua	
+++ b/Moose Development/Moose/Ops/FlightGroup.lua	
@@ -508,6 +508,17 @@ function FLIGHTGROUP:GetSquadron()
   return self.squadron
 end
 
+--- Define parking spots to be used by the flight group.
+-- This is valid only for the specified airbase.
+-- @param #FLIGHTGROUP self
+-- @param #string airbasename Name of the airbase.
+-- @param #table Table of parking spot numbers.
+-- @return #FLIGHTGROUP self
+function FLIGHTGROUP:SetParkingSpots(airbase, spots)
+  self.parkingspots[airbase]=spots
+  return self
+end
+
 --- Set the FLIGHTCONTROL controlling this flight group.
 -- @param #FLIGHTGROUP self
 -- @param Ops.FlightControl#FLIGHTCONTROL flightcontrol The FLIGHTCONTROL object.
@@ -3643,6 +3654,7 @@ end
 --- Get the proper terminal type based on generalized attribute of the group.
 --@param #FLIGHTGROUP self
 function FLIGHTGROUP:_UpdateMenu()
+  env.info("FF updating menu")
 
   local position=self.group:GetCoordinate()