diff --git a/gen/sam/aaa_flak.py b/gen/sam/aaa_flak.py
new file mode 100644
index 00000000..c9afc918
--- /dev/null
+++ b/gen/sam/aaa_flak.py
@@ -0,0 +1,39 @@
+import random
+
+from dcs.vehicles import AirDefence, Unarmed
+
+from gen.sam.group_generator import GroupGenerator
+
+GFLAK = [AirDefence.AAA_Flak_Vierling_38, AirDefence.AAA_Flak_Vierling_38, AirDefence.AAA_Flak_18, AirDefence.AAA_Flak_36, AirDefence.AAA_Flak_37, AirDefence.AAA_Flak_38]
+
+class FlakGenerator(GroupGenerator):
+    """
+    This generate a German flak artillery group
+    """
+
+    def generate(self):
+        grid_x = random.randint(2, 4)
+        grid_y = random.randint(2, 4)
+
+        spacing = random.randint(10,40)
+
+        index = 0
+        mixed = random.choice([True, False])
+        unit_type = random.choice(GFLAK)
+
+        for i in range(grid_x):
+            for j in range(grid_y):
+                index = index+1
+                self.add_unit(unit_type, "AAA#" + str(index),
+                              self.position.x + spacing*i,
+                              self.position.y + spacing*j, self.heading)
+
+                if(mixed):
+                    unit_type = random.choice(GFLAK)
+
+        # Enough Opel truck to transport the guns
+        for i in range(grid_x):
+            for j in range(grid_y):
+                self.add_unit(Unarmed.Blitz_3_6_6700A, "AAA#" + str(index),
+                              self.position.x + 200 + 9*i,
+                              self.position.y + 9*j, 90)
\ No newline at end of file
diff --git a/gen/sam/aaa_flak36.py b/gen/sam/aaa_flak36.py
deleted file mode 100644
index 34571341..00000000
--- a/gen/sam/aaa_flak36.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import random
-
-from dcs.vehicles import AirDefence
-
-from gen.sam.group_generator import GroupGenerator
-
-
-class Flak36Generator(GroupGenerator):
-    """
-    This generate a Bofors flak artillery group
-    """
-
-    def generate(self):
-        grid_x = random.randint(2, 4)
-        grid_y = random.randint(2, 4)
-
-        spacing = random.randint(10,40)
-
-        index = 0
-        for i in range(grid_x):
-            for j in range(grid_y):
-                index = index+1
-                self.add_unit(AirDefence.AAA_Flak_36, "AAA#" + str(index),
-                              self.position.x + spacing*i,
-                              self.position.y + spacing*j, self.heading)
\ No newline at end of file
diff --git a/gen/sam/sam_group_generator.py b/gen/sam/sam_group_generator.py
index 4569333c..712b3d33 100644
--- a/gen/sam/sam_group_generator.py
+++ b/gen/sam/sam_group_generator.py
@@ -1,15 +1,10 @@
-import math
 import random
 
-from dcs import unitgroup
-from dcs.point import PointAction
-from dcs.unit import Vehicle
-from dcs.unittype import UnitType
 from dcs.vehicles import AirDefence
 
 from game import db
 from gen.sam.aaa_bofors import BoforsGenerator
-from gen.sam.aaa_flak36 import Flak36Generator
+from gen.sam.aaa_flak import FlakGenerator
 from gen.sam.aaa_zu23_insurgent import ZU23InsurgentGenerator
 from gen.sam.sam_avenger import AvengerGenerator
 from gen.sam.sam_chaparral import ChaparralGenerator
@@ -55,7 +50,7 @@ SAM_MAP = {
     AirDefence.SAM_Patriot_EPP_III: PatriotGenerator,
     AirDefence.SAM_Chaparral_M48: ChaparralGenerator,
     AirDefence.AAA_Bofors_40mm: BoforsGenerator,
-    AirDefence.AAA_Flak_36: Flak36Generator,
+    AirDefence.AAA_Flak_36: FlakGenerator,
     AirDefence.SAM_SA_2_LN_SM_90: SA2Generator,
     AirDefence.SAM_SA_3_S_125_LN_5P73: SA3Generator,
     AirDefence.SAM_SA_6_Kub_LN_2P25: SA6Generator,