diff --git a/changelog.md b/changelog.md
index 36a84a4a..606f6ff2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -25,16 +25,18 @@
 * **[Mission Generator]** Fixed A-20G spawning with no payload
 * **[Mission Generator]** Fixed Su-33 spawning too heavy to take off from carrier
 * **[Mission Generator]** Base defense units were not controllable with Combined Arms
+* **[Mission Generator]** Tanker speed was too low
+* **[Mission Generator]** Tanker TACAN settings were wrong
 * **[Mission Script/Performance]** Mission lua script will not listen to weapons fired event anymore and register every fired weapons. This should improve performance especially in WW2 scenarios or when rocket artillery is firing. 
-* **[Campaign Generator]** Carrier name will now not appear for faction who do not have carriers 
-
+* **[Campaign Generator]** Carrier name will now not appear for faction who do not have carriers
+* **[Campaign Generator]** Fixed SA-10 did not have tracking radar
 * **[Units/Factions]** Remove JF-17 from USA 2005 faction
+* **[Units/Factions]** Remove AJS-37 from Russia 2010
 * **[Units/Factions]** Removed Oliver Hazard Perry from cold war factions (too powerful sam system)
 * **[Bug]** On the persian gulf full map campaign, the two carriers were sharing the same id, this was causing a lot of bugs
 * **[Performance]** Tuned the culling setting so that you cannot run into situation where no friendly or enemy AI flights are generated
-
 * **[Other]** Application doesn't gracefully exit.
-* **[Other]** Other minor fixes
+* **[Other]** Other minor fixes, and multiples factions small changes
 
 # 2.0 RC 9
 
diff --git a/gen/airsupportgen.py b/gen/airsupportgen.py
index a79fff09..9e970218 100644
--- a/gen/airsupportgen.py
+++ b/gen/airsupportgen.py
@@ -32,6 +32,7 @@ class AirSupportConflictGenerator:
     def generate(self, is_awacs_enabled):
         player_cp = self.conflict.from_cp if self.conflict.from_cp.captured else self.conflict.to_cp
 
+        CALLSIGNS = ["TKR", "TEX", "FUL", "FUE", ""]
         for i, tanker_unit_type in enumerate(db.find_unittype(Refueling, self.conflict.attackers_side)):
             self.generated_tankers.append(db.unit_type_name(tanker_unit_type))
             tanker_heading = self.conflict.to_cp.position.heading_between_point(self.conflict.from_cp.position) + TANKER_HEADING_OFFSET * i
@@ -43,12 +44,16 @@ class AirSupportConflictGenerator:
                 plane_type=tanker_unit_type,
                 position=tanker_position,
                 altitude=TANKER_ALT,
+                race_distance=50000,
                 frequency=130 + i,
                 start_type=StartType.Warm,
+                speed=574,
                 tacanchannel="{}X".format(97 + i),
             )
 
-            tanker_group.points[0].tasks.append(ActivateBeaconCommand(channel=97 + i, unit_id=tanker_group.id, aa=False))
+            tanker_group.points[0].tasks.pop() # Override PyDCS tacan channel
+            tanker_group.points[0].tasks.append(ActivateBeaconCommand(97+1, "X", CALLSIGNS[i], True, tanker_group.units[0].id, True))
+
             tanker_group.points[0].tasks.append(SetInvisibleCommand(True))
             tanker_group.points[0].tasks.append(SetImmortalCommand(True))