diff --git a/gamedir/Data-1.13/APBPConstants.ini b/gamedir/Data-1.13/APBPConstants.ini
index 24368eda5..c460030ee 100644
--- a/gamedir/Data-1.13/APBPConstants.ini
+++ b/gamedir/Data-1.13/APBPConstants.ini
@@ -293,11 +293,21 @@ BAD_AP_COST = 36
 AP_UNJAM = 2
 
 ;***********************************************************************
-;* Maximum AP penalty from supression fire                             *
-;* Modifire for how effective a suppression point is                   *
+;* Suppression AP values                                               *
+;* Maximum AP penalty from suppression fire from a single attack       *
+;* Maximum AP penalty from suppression fire for an entire turn         *
+;* Modifier for how effective a suppression point is                   *
+;* Modifier for how effective morale lost from suppression is          *
 ;***********************************************************************
-AP_MAX_SUPPRESSED = 32
+AP_MAX_SUPPRESSED = 64
+AP_MAX_TURN_SUPPRESSED = 200
 AP_SUPPRESSION_MOD = 24
+AP_LOST_PER_MORALE_DROP = 12
+
+;***********************************************************************
+;* Minimum possible value AP can be reduced to                         *
+;***********************************************************************
+AP_MIN_LIMIT = -100
 
 ;***********************************************************************
 ;* Default values to calculate AP-costs shown in Infoboxes of guns.    *
diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 18cf26336..e97d87151 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -1026,26 +1026,25 @@ CLEAR_SUPPRESSION_COUNTER = 1
 SUPPRESSION_EFFECTIVENESS = 0
 
 ;******************************************************************************************************************************
-; Limit how many APs can be lost per attack/turn. Default value is 8 (like the original JA2 code)
-; Set to 0 to remove the limit (suppression will not be limited in the number of APs it can drain). Either value can be set
-; to 0 independently.
-;
-; Range is 0 to 255. I wouldn't raise it that far if I were you, though. Could cause crashes.
+; Flags to determine if we should limit how many APs can be lost per attack/turn.  Actual AP amounts can be changed in
+; APBPConstants.ini
+;   - AP_MAX_SUPPRESSED
+;   - AP_MAX_TURN_SUPPRESSED
 ; 
+; TRUE = Use the value from APBPConstants.ini
+; FALSE = Ignore the value in APBPConstants.ini
 ;******************************************************************************************************************************
 
-MAX_SUPPRESSION_AP_LOSS_PER_TURN = 50
-MAX_SUPPRESSION_AP_LOSS_PER_ATTACK = 16
+LIMITED_SUPPRESSION_AP_LOSS_PER_TURN = TRUE
+LIMITED_SUPPRESSION_AP_LOSS_PER_ATTACK = TRUE
 
 ;******************************************************************************************************************************
-; HEADROCK: This is the absolute minimum number of APs a character can reach due to suppression. Naturally, it can be negative
-; (negative values carry over to the next turn).
+; Minimum and Maximum amounts that Suppression Tolerance can be modified to based on various in game factors
 ; 
-; Range = -128 to +128. Of course, a value of 20 or more would probably render suppression useless. Keep a bit below 0 for best
-; results.
+; NOTE: You'll cause problems if you set MIN to a value greater then MAX
 ;******************************************************************************************************************************
-
-MIN_LIMIT_SUPPRESSION_AP_LOSS = -25
+SUPPRESSION_TOLERANCE_MAX = 18
+SUPPRESSION_TOLERANCE_MIN = 1
 
 ;******************************************************************************************************************************
 ; Turn Suppression Shock on and off. Suppression shock is a feature that causes any suppressed characters to
@@ -1095,14 +1094,6 @@ AIM_PENALTY_PER_TARGET_SHOCK = 2
 
 COWER_EFFECT_ON_SUPPRESSION = 150
 
-;******************************************************************************************************************************
-; This controls how many APs must be lost due to suppression, in order to get a 1-point drop in Morale. JA2 1.13 
-; default is 2 AP per morale loss. Set this higher to reduce the effect of suppression on morale (helps prevent enemies running 
-; away too soon after being suppressed).
-;******************************************************************************************************************************
-
-AP_LOST_PER_MORALE_DROP = 3
-
 ;******************************************************************************************************************************
 ; The next three settings control realistic tracer fire.
 ;