diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index 2d76745df..caf0f636b 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -1097,6 +1097,20 @@ NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT = FALSE
 
 AUTO_COLLAPSE_INVENTORY_ON_TURN_END = FALSE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Default: TRUE
+; Don't create new squad for every passenger leaving vehicle, instead add him for any squad with empty slot (vanilla: FALSE).
+;------------------------------------------------------------------------------------------------------------------------------
+
+ADD_PASSENGER_TO_ANY_SQUAD = TRUE
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Default: FALSE
+; Automatically switch to passenger's squad when leaving vehicle (vanilla: TRUE).
+;------------------------------------------------------------------------------------------------------------------------------
+
+PASSENGER_LEAVING_SWITCH_TO_NEW_SQUAD = FALSE
+
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
 
@@ -2050,24 +2064,27 @@ AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_MODE = 3
 ; If AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_MODE is set, adjust how much APs will be deducted (0 - 200).
 AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_SCALE = 100
 
+; If set to TRUE, vehicles can be driven through tactical maps.
+ALLOW_DRIVING_VEHICLES_IN_TACTICAL = TRUE
+
+; Deduct APs from passengers when vehicle is moving to prevent exploits (default = 3).
+; 0 - No change.
+; 1 - AP deducted from vehicle are also deducted from all passengers.
+; 2 - AP deducted from vehicle are also deducted from all passengers, but adjusted to initial APs of any given passenger.
+; 3 - AP deducted from vehicle are also deducted from all passengers, but only to the certain threshold (default).
+AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_MODE = 3
+
+; If AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_MODE is set, adjust how much APs will be deducted (0 - 200).
+AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_SCALE = 100
+
+;******************************************************************************************************************************
+
+[Tactical Cover System Settings]
+
 ;******************************************************************************************************************************
 ; These are settings for the new Cover Display system, shown when you press 'END' in the tactical screen.
 ;******************************************************************************************************************************
 
-; For every level of the stealth trait, X points (to your standard stealth value + equipment) gets added.
-COVER_SYSTEM_STEALTH_TRAIT_VALUE = 15
-
-; This tell how much a stealth value of 100 will decrese the sight range of an enemy. 
-; 50% means that at 100 stealth level you have reduced the enemies sight range by 50%.
-COVER_SYSTEM_STEALTH_EFFECTIVENESS = 50
-
-; This is similar to STEALTH_EFFECTIVENESS.
-; 100% wood camoflague will reduce the enemies vision if you are on wooden terrain.
-COVER_SYSTEM_CAMOUFLAGE_EFFECTIVENESS = 50
-
-; How much the stance influences the view range reduction. Prone will give you 10% (default) view reduction / cover.
-COVER_SYSTEM_STANCE_EFFECTIVENESS = 10
-
 ; Dual welding the longest sniper rifles with full attachements, having a third backup sniper rifle, 
 ; one combat pack and one backpack will give a 50% (default) sight penalty with the default settings.
 COVER_SYSTEM_LBE_EFFECTIVENESS = 20