diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI
index 2dc56a339..43c70492a 100644
--- a/Data-1.13/Ja2_Options.INI
+++ b/Data-1.13/Ja2_Options.INI
@@ -638,6 +638,7 @@ SOLDIER_TOOLTIP_DETAIL_LEVEL = 1
 ; Set HELMET and VEST and LEGGINGS to FALSE (all 3) to prevent the display of the armor line
 ; Set HEAD_SLOT_1 and HEAD_SLOT_2 both to FALSE to prevent the display of the NVG and gas mask lines
 
+DYNAMIC_SOLDIER_TOOLTIPS = TRUE
 
 SOLDIER_TOOLTIP_DISPLAY_LOCATION = TRUE
 SOLDIER_TOOLTIP_DISPLAY_BRIGHTNESS = TRUE
diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI
index 8b2aabbcd..f1576bbfa 100644
--- a/Data/Ja2_Options.INI
+++ b/Data/Ja2_Options.INI
@@ -632,6 +632,8 @@ SOLDIER_TOOLTIP_DETAIL_LEVEL = 1
 ; Set HELMET and VEST and LEGGINGS to FALSE (all 3) to prevent the display of the armor line
 ; Set HEAD_SLOT_1 and HEAD_SLOT_2 both to FALSE to prevent the display of the NVG and gas mask lines
 
+DYNAMIC_SOLDIER_TOOLTIPS = TRUE
+
 SOLDIER_TOOLTIP_DISPLAY_LOCATION = TRUE
 SOLDIER_TOOLTIP_DISPLAY_BRIGHTNESS = TRUE
 SOLDIER_TOOLTIP_DISPLAY_RANGE_TO_TARGET = TRUE
diff --git a/ja2.exe b/ja2.exe
index 6b67e7b53..efcb264d0 100644
Binary files a/ja2.exe and b/ja2.exe differ
diff --git a/ja2_debug.exe b/ja2_debug.exe
deleted file mode 100644
index 6b276f637..000000000
Binary files a/ja2_debug.exe and /dev/null differ