diff --git a/Moose Development/Moose/Functional/RAT2.lua b/Moose Development/Moose/Functional/RAT2.lua
index 89ab94f1d..ebc243efa 100644
--- a/Moose Development/Moose/Functional/RAT2.lua	
+++ b/Moose Development/Moose/Functional/RAT2.lua	
@@ -104,11 +104,11 @@ end
 -- @param #string To To state.
 function RAT2:onafterStatus(From, Event, To)
 
+  self:I(string.format("RAT status %s", self:GetState()))
+
   -- Check queue of aircraft to spawn.
   self:_CheckQueueSpawn()
   
-  self:_CheckArrived()
-  
   self:__Status(-10)
 end
 
@@ -117,58 +117,69 @@ end
 -- @param #RAT2 self
 function RAT2:_CheckQueueSpawn()
 
+  self:I(string.format("Checking flights"))
+
+  -- Loop over all ratcraft.
   for i,_ratcraft in pairs(self.Qcraft) do
     local ratcraft=_ratcraft --Functional.RatCraft#RATCRAFT
 
     -- Get number of alive groups.
     local Nalive=ratcraft:_GetAliveGroups()
-
-    -- Check if new groups should be spawned.    
-    if Nalive<ratcraft.Nspawn then
     
-      -- Get departure and parking.
-      local departure, parking=ratcraft:GetDeparture()
+    for _,_flight in pairs(ratcraft.flights) do
+      local flight=_flight --Ops.FlightGroup#FLIGHTGROUP
       
-      -- Get destination depending on departure.
-      local destination=ratcraft:GetDestination(departure)
+      self:I(string.format("Checking flight group %s in status %s", flight.groupname, flight:GetState()))
       
-      if departure and destination then
+      if flight:IsInUtero() or flight:IsArrived() or flight:IsDead() then
       
-        parking=departure.parking or parking
-      
-        -- Try to spawn a ratcraft group.
-        local group=self:_SpawnRatcraft(ratcraft, departure, destination, parking)
-        
-        -- Remove queue item and break loop.
-        if group then
-  
-          -- We add a little delay
-          self:__Spawned(0.1, group, ratcraft)
+        self:I(string.format("Spawning new flight group %s in status %s", flight.groupname, flight:GetState()))
           
-          break
-        end
+        -- Get departure and parking.
+        local departure, parking=ratcraft:GetDeparture()
         
-      end
-      
-    end    
-  end
-  
+        -- Get destination depending on departure.
+        local destination=ratcraft:GetDestination(departure)
+        
+        if departure and destination then
+        
+          parking=departure.parking or parking
+        
+          -- Try to spawn a ratcraft group.
+          local group=self:_SpawnRatcraft(ratcraft, flight, departure, destination, parking)
+          
+          -- Remove queue item and break loop.
+          if group then
+    
+            -- We add a little delay
+            self:__Spawned(0.1, group, flight, ratcraft)
+            
+            break
+          end -- if group
+          
+        end -- if departure        
+      end -- if spawn flight    
+    end -- for flights
+  end -- for ratcraft
 end
 
 --- Check spawn queue and spawn aircraft if necessary.
 -- @param #RAT2 self
 function RAT2:_CheckArrived()
 
-  for _,_flight in pairs(self.flights) do
-    local flight=_flight --Ops.FlightGroup#FLIGHTGROUP
-    
-    if flight:IsArrived() then
-      -- Destroy group and create a remove unit event.
-      flight.group:Destroy(nil)
+  for _,_ratcraft in pairs(self.Qcraft) do
+    local ratcraft=_ratcraft --Functional.RatCraft#RATCRAFT
+    for _,_flight in pairs(ratcraft.flights) do
+      local flight=_flight --Ops.FlightGroup#FLIGHTGROUP
+      
+      if flight:IsArrived() then
+        -- Destroy group and create a remove unit event.
+        flight.group:Destroy(nil)
+      end
+      
     end
-    
   end
-
+  
 end
 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -177,11 +188,15 @@ end
 
 --- Function called after a RAT group was spawned.
 -- @param #RAT2 self
-function RAT2:onafterSpawned(From, Event, To, group, ratcraft)
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+-- @param Wrapper.Group#GROUP group The spawned group.
+-- @param Ops.FlightGroup#FLIGHTGROUP flight The flight group.
+-- @param Functional.RatCraft#RATCRAFT ratcraft The ratcraft object.
+function RAT2:onafterSpawned(From, Event, To, group, flight, ratcraft)
 
-  local flightgroup=FLIGHTGROUP:New(group:GetName())
-        
-  table.insert(ratcraft.flights, flightgroup)      
+  group:SmokeGreen()
 
 end
 
@@ -191,15 +206,16 @@ end
 
 --- Spawn an aircraft asset (plane or helo) at the airbase associated with the warehouse.
 -- @param #RAT2 self
--- @param #RATAC ratcraft Ratcraft to spawn.
+-- @param Functional.RatCraft#RATCRAFT ratcraft Ratcraft to spawn.
+-- @param Ops.FlightGroup#FLIGHTGROUP flight Flight group.
 -- @param Functional.RatCraft#RATCRAFT.Departure departure Departure.
 -- @param Functional.RatCraft#RATCRAFT.Departure destination Destination.
 -- @param #table parking Parking data for this group.
 -- @return Wrapper.Group#GROUP The spawned group or nil if the group could not be spawned.
-function RAT2:_SpawnRatcraft(ratcraft, departure, destination, parking)
+function RAT2:_SpawnRatcraft(ratcraft, flight, departure, destination, parking)
 
   -- Prepare the spawn template.
-  local template=self:_SpawnAssetPrepareTemplate(ratcraft)
+  local template=self:_SpawnAssetPrepareTemplate(ratcraft, flight.groupname)
   
     -- Get flight path if the group goes to another warehouse by itself.
   template.route.points=self:_GetFlightplan(ratcraft, AIRBASE:FindByName(departure.name), AIRBASE:FindByName(destination.name))
@@ -301,15 +317,16 @@ end
 
 --- Prepare a spawn template for the asset. Deep copy of asset template, adjusting template and unit names, nillifying group and unit ids.
 -- @param #RAT2 self
--- @param #RATAC ratcraft Aircraft that will be spawned.
+-- @param Functional.RatCraft#RATCRAFT ratcraft Aircraft that will be spawned.
+-- @param #string groupname Name for the group to be spawned.
 -- @return #table Prepared new spawn template.
-function RAT2:_SpawnAssetPrepareTemplate(ratcraft)
+function RAT2:_SpawnAssetPrepareTemplate(ratcraft, groupname)
 
   -- Create an own copy of the template!
   local template=UTILS.DeepCopy(ratcraft.template)
 
   -- Set unique name.
-  template.name=ratcraft.alias
+  template.name=groupname
 
   -- Set current(!) coalition and country.
   template.CoalitionID=ratcraft.coalition
@@ -330,7 +347,7 @@ function RAT2:_SpawnAssetPrepareTemplate(ratcraft)
   for i=1,#template.units do
 
     -- Unit template.
-    local unit = template.units[i]
+    local unit=template.units[i]
 
     -- Nillify the unit ID.
     unit.unitId=nil
diff --git a/Moose Development/Moose/Functional/RatCraft.lua b/Moose Development/Moose/Functional/RatCraft.lua
index 371ee32fb..2f7d57bd8 100644
--- a/Moose Development/Moose/Functional/RatCraft.lua	
+++ b/Moose Development/Moose/Functional/RatCraft.lua	
@@ -48,7 +48,7 @@
 -- @field #boolean journey If true, continue journey from the current destination.
 -- @field #string takeoff Takeoff type cold, hot, air.
 -- @field #string landing Landing type.
--- @field #table Table of flight groups.
+-- @field #table flights Table of flight groups.
 -- @field #number Nspawn Number of max spawned aircraft groups. 
 -- @extends Core.Fsm#FSM
 RATCRAFT = {
@@ -82,8 +82,7 @@ RATCRAFT = {
   takeoff        = nil,
   landing        = nil,
   flights        =  {},
-  Nalive         =   0,
-  Nspawn         =   1,
+  Nspawn         =   2,
 }
 
 --- Generalized asset attributes. Can be used to request assets with certain general characteristics. See [DCS attributes](https://wiki.hoggitworld.com/view/DCS_enum_attributes) on hoggit.
@@ -143,18 +142,47 @@ RATCRAFT.DeType={
 --- Create a new RATCRAFT class object from a template group defined in the mission editor.
 -- @param #RATCRAFT self
 -- @param #string groupname Name of the **late activated** template group.
+-- @param #number nspawn Number of groups to spawn. Default 1.
 -- @param #string alias (Optional) Alias for the group name used as spawn name prefix. Default is the group name. 
 -- @return #RATCRAFT self
-function RATCRAFT:New(groupname, alias)
+function RATCRAFT:New(groupname, nspawn, alias)
 
   -- Inherit everything from FSM class.
   local self=BASE:Inherit(self, FSM:New()) --#RATCRAFT
   
-  self.templategroup=GROUP:FindByName(groupname)
-  self.templatename=groupname
-  self.template=self.templategroup:GetTemplate()
+  -- Defaults
+  self.Nspawn=nspawn or 1
   self.alias=alias or groupname
   
+  -- Start State.
+  self:SetStartState("Stopped")
+
+  -- Add FSM transitions.
+  --                 From State  -->   Event      -->     To State
+  self:AddTransition("Stopped",       "Load",            "Stopped")     -- Load ratcraft from file.
+  self:AddTransition("Stopped",       "Start",           "Running")     -- Start RAT2 script.
+  self:AddTransition("Running",       "Pause",           "Paused")      -- Pause spawning RATCRAFT.
+  self:AddTransition("Paused",        "Unpause",         "Running")     -- UnPause spawning RATCRAFT.
+  
+  -- Initialize aircraft parameters.
+  self:_Init(groupname)
+  
+  self:Start()
+  
+  return self
+end
+
+--- Init aircraft parameters.
+-- @param #RATCRAFT self
+-- @param #string groupname Name of the template group.
+-- @return #RATCRAFT self
+function RATCRAFT:_Init(groupname)
+
+  self.templatename=groupname  
+  self.templategroup=GROUP:FindByName(groupname)
+  self.template=self.templategroup:GetTemplate()
+  
+  
   self.speedmax=self.templategroup:GetSpeedMax()
   self.range=1000000
   self.DCSdesc=self.templategroup:GetDCSDesc(1)
@@ -169,26 +197,6 @@ function RATCRAFT:New(groupname, alias)
   self.sizey=self.DCSdesc.box.max.y
   self.sizez=self.DCSdesc.box.max.z
   self.size =math.max(self.sizex, self.sizez)
-  
-  
-  -- Start State.
-  self:SetStartState("Stopped")
-
-  -- Add FSM transitions.
-  --                 From State  -->   Event      -->     To State
-  self:AddTransition("Stopped",       "Load",            "Stopped")     -- Load ratcraft from file.
-  self:AddTransition("Stopped",       "Start",           "Running")     -- Start RAT2 script.
-  self:AddTransition("Running",       "Pause",           "Paused")      -- Pause spawning RATCRAFT.
-  self:AddTransition("Paused",        "Unpause",         "Running")     -- UnPause spawning RATCRAFT.
-   
-  return self
-end
-
---- Init aircraft parameters.
--- @param #RATCRAFT self
--- @return #RATCRAFT self
-function RATCRAFT:_Init()
-
 
 end
 
@@ -239,13 +247,13 @@ function RATCRAFT:AddDestinationAirbase(airbasename, parking)
 
   local destination={} --#RATCRAFT.Departure  
 
+  -- Convert parking IDs to complete parking data.
   local spots=nil
   if parking then
     if type(parking)=="number" then
       parking={parking}
     end
     
-    -- Convert parking IDs to complete parking data.
     spots={}
     local airbase=AIRBASE:FindByName(airbasename)
     for _,TerminalID in pairs(parking) do
@@ -282,6 +290,30 @@ function RATCRAFT:AddDepartureZone(zone)
   return self
 end
 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- FSM Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Add a departure for the aircraft.
+-- @param #RATCRAFT self
+function RATCRAFT:onafterStart()
+
+  -- Create flight groups.
+  for i=1,self.Nspawn do
+  
+    -- Group name.
+    local groupname=string.format("%s-%02d", self.alias, i)
+    
+    -- New flight group.
+    local flightgroup=FLIGHTGROUP:New(groupname)
+    
+    -- Add flight to tabloe.
+    table.insert(self.flights, flightgroup)
+    
+  end
+
+end
+
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Departure Functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua
index 8e0270c20..c3d13f97b 100644
--- a/Moose Development/Moose/Ops/FlightGroup.lua	
+++ b/Moose Development/Moose/Ops/FlightGroup.lua	
@@ -286,7 +286,7 @@ function FLIGHTGROUP:New(groupname)
 
   -- Add FSM transitions.
   --                 From State  -->   Event      -->      To State
-  self:AddTransition("Stopped",       "Start",             "Running")     -- Start FSM.
+  self:AddTransition("Stopped",       "Start",             "InUtero")     -- Start FSM.
   self:AddTransition("*",             "Stop",              "Stopped")     -- Stop FSM.
 
   self:AddTransition("*",             "FlightStatus",      "*")           -- FLIGHTGROUP status update.
@@ -593,51 +593,58 @@ function FLIGHTGROUP:GetWaypointCurrent()
   return self.waypoints[self.currentwp]
 end
 
+--- Check if flight is in state in utero.
+-- @param #FLIGHTGROUP self
+-- @return #boolean If true, flight is not spawned yet.
+function FLIGHTGROUP:IsInUtero()
+  return self:Is("InUtero")
+end
+
 --- Check if flight is in state spawned.
 -- @param #FLIGHTGROUP self
--- @return #boolean
+-- @return #boolean If true, flight is spawned.
 function FLIGHTGROUP:IsSpawned()
   return self:Is("Spawned")
 end
 
 --- Check if flight is parking.
 -- @param #FLIGHTGROUP self
--- @return #boolean
+-- @return #boolean If true, flight is parking after spawned.
 function FLIGHTGROUP:IsParking()
   return self:Is("Parking")
 end
 
 --- Check if flight is parking.
 -- @param #FLIGHTGROUP self
--- @return #boolean
+-- @return #boolean If true, flight is taxiing after engine start up.
 function FLIGHTGROUP:IsTaxiing()
   return self:Is("Taxiing")
 end
 
 --- Check if flight is airborne.
 -- @param #FLIGHTGROUP self
--- @return #boolean
+-- @return #boolean If true, flight is airborne.
 function FLIGHTGROUP:IsAirborne()
   return self:Is("Airborne")
 end
 
 --- Check if flight is landing.
 -- @param #FLIGHTGROUP self
--- @return #boolean
+-- @return #boolean If true, flight is landing, i.e. on final approach.
 function FLIGHTGROUP:IsLanding()
   return self:Is("Landing")
 end
 
 --- Check if flight has landed and is now taxiing to its parking spot.
 -- @param #FLIGHTGROUP self
--- @return #boolean
+-- @return #boolean If true, flight has landed
 function FLIGHTGROUP:IsLanded()
   return self:Is("Landed")
 end
 
 --- Check if flight has arrived at its destination parking spot.
 -- @param #FLIGHTGROUP self
--- @return #boolean
+-- @return #boolean If true, flight has arrived at its destination and is parking.
 function FLIGHTGROUP:IsArrived()
   return self:Is("Arrived")
 end
@@ -651,7 +658,7 @@ end
 
 --- Check if flight is dead.
 -- @param #FLIGHTGROUP self
--- @return #boolean
+-- @return #boolean If true, all units/elements of the flight are dead.
 function FLIGHTGROUP:IsDead()
   return self:Is("Dead")
 end