diff --git a/theater/caucasus.py b/theater/caucasus.py
index 3fadd1d7..ebc4e781 100644
--- a/theater/caucasus.py
+++ b/theater/caucasus.py
@@ -22,7 +22,7 @@ class CaucasusTheater(ConflictTheater):
         "night": (0, 5),
     }
 
-    carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-305810.6875, 406399.1875))
+    carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-305810.6875, 406399.1875), 1001)
 
     def __init__(self, load_ground_objects=True):
         super(CaucasusTheater, self).__init__()
@@ -102,7 +102,7 @@ class WesternGeorgia(ConflictTheater):
         self.sukhumi = ControlPoint.from_airport(caucasus.Sukhumi_Babushara, COAST_DR_E, SIZE_REGULAR, 1.2)
         self.gudauta = ControlPoint.from_airport(caucasus.Gudauta, COAST_DR_E, SIZE_REGULAR, 1.2)
         self.sochi = ControlPoint.from_airport(caucasus.Sochi_Adler, COAST_DR_E, SIZE_BIG, IMPORTANCE_HIGH)
-        self.carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-285810.6875, 496399.1875))
+        self.carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-285810.6875, 496399.1875), 1001)
 
         self.add_controlpoint(self.kutaisi, connected_to=[self.senaki])
         self.add_controlpoint(self.senaki, connected_to=[self.kobuleti, self.sukhumi, self.kutaisi])
@@ -144,7 +144,7 @@ class WesternGeorgiaInverted(ConflictTheater):
         self.sukhumi = ControlPoint.from_airport(caucasus.Sukhumi_Babushara, COAST_DR_E, SIZE_REGULAR, 1.2)
         self.gudauta = ControlPoint.from_airport(caucasus.Gudauta, COAST_DR_E, SIZE_REGULAR, 1.2)
         self.sochi = ControlPoint.from_airport(caucasus.Sochi_Adler, COAST_DR_E, SIZE_BIG, IMPORTANCE_HIGH)
-        self.carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-285810.6875, 496399.1875))
+        self.carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-285810.6875, 496399.1875), 1001)
 
         self.add_controlpoint(self.kutaisi, connected_to=[self.senaki])
         self.add_controlpoint(self.senaki, connected_to=[self.kobuleti, self.sukhumi, self.kutaisi])
@@ -174,7 +174,7 @@ class NorthCaucasus(ConflictTheater):
         "night": (0, 5),
     }
 
-    carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-305810.6875, 406399.1875))
+    carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-305810.6875, 406399.1875), 1001)
 
     def __init__(self, load_ground_objects=True):
         super(NorthCaucasus, self).__init__()
@@ -186,7 +186,7 @@ class NorthCaucasus(ConflictTheater):
         self.nalchik = ControlPoint.from_airport(caucasus.Nalchik, LAND, SIZE_REGULAR, 1.1)
         self.mineralnye = ControlPoint.from_airport(caucasus.Mineralnye_Vody, LAND, SIZE_BIG, 1.3)
         self.mozdok = ControlPoint.from_airport(caucasus.Mozdok, LAND, SIZE_BIG, 1.1)
-        self.carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-285810.6875, 496399.1875))
+        self.carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-285810.6875, 496399.1875), 1001)
 
         self.vaziani.frontline_offset = 0.5
         self.vaziani.base.strength = 1
diff --git a/theater/controlpoint.py b/theater/controlpoint.py
index 0cf09872..f8d4380f 100644
--- a/theater/controlpoint.py
+++ b/theater/controlpoint.py
@@ -12,7 +12,7 @@ from .theatergroundobject import TheaterGroundObject
 
 
 class ControlPointType(Enum):
-    AIRBASE = 0                # An airbase with slot for everything
+    AIRBASE = 0                # An airbase with slots for everything
     AIRCRAFT_CARRIER_GROUP = 1 # A group with a Stennis type carrier (F/A-18, F-14 compatible)
     LHA_GROUP = 2              # A group with a Tarawa carrier (Helicopters & Harrier)
     FARP = 4                   # A FARP, with slots for helicopters
@@ -75,7 +75,7 @@ class ControlPoint:
         return obj
 
     @classmethod
-    def carrier(cls, name: str, at: Point, id: int = 1001):
+    def carrier(cls, name: str, at: Point, id: int):
         import theater.conflicttheater
         cp = cls(id, name, at, at, theater.conflicttheater.LAND, theater.conflicttheater.SIZE_SMALL, 1,
                    has_frontline=False, cptype=ControlPointType.AIRCRAFT_CARRIER_GROUP)
@@ -87,7 +87,7 @@ class ControlPoint:
         return cp
 
     @classmethod
-    def lha(cls, name: str, at: Point, id: int = 1002):
+    def lha(cls, name: str, at: Point, id: int):
         import theater.conflicttheater
         cp = cls(id, name, at, at, theater.conflicttheater.LAND, theater.conflicttheater.SIZE_SMALL, 1,
                    has_frontline=False, cptype=ControlPointType.LHA_GROUP)
diff --git a/theater/persiangulf.py b/theater/persiangulf.py
index fbd96e0f..4f05b051 100644
--- a/theater/persiangulf.py
+++ b/theater/persiangulf.py
@@ -48,8 +48,8 @@ class PersianGulfTheater(ConflictTheater):
         self.liwa = ControlPoint.from_airport(persiangulf.Liwa_Airbase, LAND, SIZE_BIG, IMPORTANCE_HIGH)
         self.jiroft = ControlPoint.from_airport(persiangulf.Jiroft_Airport, LAND, SIZE_BIG, IMPORTANCE_HIGH)
         self.bandar_e_jask = ControlPoint.from_airport(persiangulf.Bandar_e_Jask_airfield, LAND, SIZE_TINY,IMPORTANCE_LOW)
-        self.west_carrier = ControlPoint.carrier("West carrier", Point(-69043.813952358, -159916.65947136))
-        self.east_carrier = ControlPoint.carrier("East carrier", Point(59514.324335475, 28165.517980635))
+        self.west_carrier = ControlPoint.carrier("West carrier", Point(-69043.813952358, -159916.65947136), 1001)
+        self.east_carrier = ControlPoint.carrier("East carrier", Point(59514.324335475, 28165.517980635), 1002)
 
         self.add_controlpoint(self.liwa, connected_to=[self.al_dhafra])
         self.add_controlpoint(self.al_dhafra, connected_to=[self.liwa, self.al_maktoum, self.al_ain])