diff --git a/GameSettings.cpp b/GameSettings.cpp
index f508b8741..50a25cd60 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -310,7 +310,13 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.fMercDayOne			= iniReader.ReadBoolean("JA2 Laptop Settings","MERC_AVAILABLE_DAY_ONE",FALSE);
 	gGameExternalOptions.fAllMercsAvailable		= iniReader.ReadBoolean("JA2 Laptop Settings","ALL_MERCS_AT_MERC",FALSE);
 
-	
+	//Merc Death Settings:
+	gGameExternalOptions.gfMercsDieOnAssignment			  = iniReader.ReadBoolean("JA2 Laptop Settings","MERCS_DIE_ON_ASSIGNMENT",TRUE);
+	gGameExternalOptions.giEasyMercDeaths		          = iniReader.ReadInteger("JA2 Laptop Settings","EASY_MERC_DEATHS",1);
+	gGameExternalOptions.giExperiencedMercDeaths	    = iniReader.ReadInteger("JA2 Laptop Settings","EXPERIENCED_MERC_DEATHS",2);
+	gGameExternalOptions.giExpertMercDeaths	          = iniReader.ReadInteger("JA2 Laptop Settings","EXPERT_MERC_DEATHS",3);
+	gGameExternalOptions.giInsaneMercDeaths	          = iniReader.ReadInteger("JA2 Laptop Settings","INSANE_MERC_DEATHS",4);
+
 	//################# System Settings #################
 	gGameExternalOptions.gubDeadLockDelay = iniReader.ReadInteger("JA2 System Settings","DEAD_LOCK_DELAY",15);
 	gGameExternalOptions.gfEnableEmergencyButton_SkipStrategicEvents = iniReader.ReadBoolean("JA2 System Settings","ENABLE_EMERGENCY_BUTTON_NUMLOCK_TO_SKIP_STRATEGIC_EVENTS",0);
diff --git a/GameSettings.h b/GameSettings.h
index a256063e9..1f5a6be14 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -379,6 +379,14 @@ typedef struct
 	BOOLEAN fEnableSoldierTooltipBigSlot4;
 	// ShadoWarrior: Tooltip changes (end)
 
+	//Kaiden MERC Deaths Externalized:
+	BOOLEAN gfMercsDieOnAssignment;
+	INT32 giEasyMercDeaths;
+	INT32 giExperiencedMercDeaths;
+	INT32 giExpertMercDeaths;
+	INT32 giInsaneMercDeaths;
+
+
 } GAME_EXTERNAL_OPTIONS;
 
 //This structure will contain general Ja2 settings  NOT individual game settings.
diff --git a/GameVersion.cpp b/GameVersion.cpp
index ae454f23d..bdb90ccab 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -13,7 +13,7 @@
 #ifdef JA2BETAVERSION
 
 //BETA/TEST BUILD VERSION
-INT16		zVersionLabel[256]		= { L"Map Editor v1.13.579" }; 
+INT16		zVersionLabel[256]		= { L"Map Editor v1.13.592" }; 
 
 #elif defined CRIPPLED_VERSION
 
@@ -22,7 +22,7 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 
 #else
 
-	//RELEASE BUILD VERSION 
+	//RELEASE BUILD VERSION  
 	INT16		zVersionLabel[256]		= { L"Release v1.13.592" };
 
 
diff --git a/JA2.opt b/JA2.opt
index e588d2622..a359a007f 100644
Binary files a/JA2.opt and b/JA2.opt differ
diff --git a/JA2.plg b/JA2.plg
index cfb2cca9c..371566d38 100644
--- a/JA2.plg
+++ b/JA2.plg
@@ -6,7 +6,7 @@
 --------------------Configuration: TileEngine - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPC.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP63.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/TileEngine.pch" /YX"TileEngine All.h" /Fo"Release/" /Fd"Release/" /FD /O2b2 /c 
 "C:\JA2\Build\TileEngine\Ambient Control.cpp"
@@ -46,8 +46,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPC.tmp" with contents
 "C:\JA2\Build\TileEngine\worldman.cpp"
 "C:\JA2\Build\TileEngine\XML_ExplosionData.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPC.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP63.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP64.tmp" with contents
 [
 /nologo /out:"Release\TileEngine.lib" 
 ".\Release\Ambient Control.obj"
@@ -87,7 +87,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD.tmp" with contents
 .\Release\worldman.obj
 .\Release\XML_ExplosionData.obj
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP64.tmp"
 <h3>Output Window</h3>
 Compiling...
 Ambient Control.cpp
@@ -132,7 +132,7 @@ Creating library...
 --------------------Configuration: Standard Gaming Platform - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP65.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\TileEngine" /I "..\Tactical" /I "..\Utils" /I "..\strategic" /I ".\\" /D "NO_ZLIB" /D "JA2_PRECOMPILED_HEADERS" /D "NO_ZLIB_COMPRESSION" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR".\Release/" /Fp".\Release/Standard Gaming Platform.pch" /YX"JA2 SGP ALL.H" /Fo".\Release/" /Fd".\Release/" /FD /c 
 "C:\JA2\Build\Standard Gaming Platform\Button Sound Control.cpp"
@@ -172,14 +172,14 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE.tmp" with contents
 "C:\JA2\Build\Standard Gaming Platform\vsurface.cpp"
 "C:\JA2\Build\Standard Gaming Platform\WinFont.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPF.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP65.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP66.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\TileEngine" /I "..\Tactical" /I "..\Utils" /I "..\strategic" /I ".\\" /D "NO_ZLIB" /D "JA2_PRECOMPILED_HEADERS" /D "NO_ZLIB_COMPRESSION" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /D "_DEBUG" /FR".\Release/" /Fp".\Release/Standard Gaming Platform.pch" /YX"JA2 SGP ALL.H" /Fo".\Release/" /Fd".\Release/" /FD /c 
 "C:\JA2\Build\Standard Gaming Platform\DEBUG.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPF.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP10.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP66.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP67.tmp" with contents
 [
 /nologo /out:".\Release\Standard Gaming Platform.lib" 
 ".\Release\Button Sound Control.obj"
@@ -221,7 +221,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP10.tmp" with content
 ".\Release\WinFont.obj"
 ".\ddraw.lib"
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP10.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP67.tmp"
 <h3>Output Window</h3>
 Compiling...
 Button Sound Control.cpp
@@ -275,7 +275,7 @@ Creating library...
 --------------------Configuration: Tactical - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP11.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP68.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /FR"Release/" /Fp"Release/Tactical.pch" /YX"Tactical All.h" /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\JA2\Build\Tactical\Air Raid.cpp"
@@ -372,14 +372,14 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP11.tmp" with content
 "C:\JA2\Build\Tactical\XML_Sounds.cpp"
 "C:\JA2\Build\Tactical\XML_TonyInventory.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP11.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP12.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP68.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP69.tmp" with contents
 [
 /nologo /MT /W3 /GX /Od /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /FR"Release/" /Fp"Release/Tactical.pch" /YX"Tactical All.h" /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\JA2\Build\Tactical\LOS.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP12.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP13.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP69.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6A.tmp" with contents
 [
 /nologo /out:"Release\Tactical.lib" 
 ".\Release\Air Raid.obj"
@@ -477,7 +477,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP13.tmp" with content
 .\Release\XML_Sounds.obj
 .\Release\XML_TonyInventory.obj
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP13.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6A.tmp"
 <h3>Output Window</h3>
 Compiling...
 Air Raid.cpp
@@ -586,7 +586,7 @@ Creating library...
 --------------------Configuration: Utils - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP14.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6B.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Utils.pch" /YX"Utils All.h" /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\JA2\Build\Utils\_DutchText.cpp"
@@ -629,8 +629,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP14.tmp" with content
 "C:\JA2\Build\Utils\XML_Strings.cpp"
 "C:\JA2\Build\Utils\XML_Strings2.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP14.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP15.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6B.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6C.tmp" with contents
 [
 /nologo /out:"Release\Utils.lib" 
 .\Release\_DutchText.obj
@@ -673,7 +673,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP15.tmp" with content
 .\Release\XML_Strings.obj
 .\Release\XML_Strings2.obj
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP15.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6C.tmp"
 <h3>Output Window</h3>
 Compiling...
 _DutchText.cpp
@@ -732,7 +732,7 @@ Creating library...
 --------------------Configuration: TacticalAI - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP16.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6D.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/TacticalAI.pch" /YX"AI All.h" /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\JA2\Build\TacticalAI\AIList.cpp"
@@ -750,8 +750,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP16.tmp" with content
 "C:\JA2\Build\TacticalAI\QuestDebug.cpp"
 "C:\JA2\Build\TacticalAI\Realtime.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP16.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP17.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6D.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6E.tmp" with contents
 [
 /nologo /out:"Release\TacticalAI.lib" 
 .\Release\AIList.obj
@@ -769,7 +769,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP17.tmp" with content
 .\Release\QuestDebug.obj
 .\Release\Realtime.obj
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP17.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6E.tmp"
 <h3>Output Window</h3>
 Compiling...
 AIList.cpp
@@ -792,7 +792,7 @@ Creating library...
 --------------------Configuration: Editor - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP18.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6F.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /Ob2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Editor.pch" /YX"Editor All.h" /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\JA2\Build\Editor\Cursor Modes.cpp"
@@ -820,8 +820,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP18.tmp" with content
 "C:\JA2\Build\Editor\smooth.cpp"
 "C:\JA2\Build\Editor\Smoothing Utils.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP18.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP19.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6F.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP70.tmp" with contents
 [
 /nologo /out:"Release\Editor.lib" 
 ".\Release\Cursor Modes.obj"
@@ -849,10 +849,11 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP19.tmp" with content
 .\Release\smooth.obj
 ".\Release\Smoothing Utils.obj"
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP19.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP70.tmp"
 <h3>Output Window</h3>
 Compiling...
 Cursor Modes.cpp
+GENERATED PCH FOR EDITOR PROJECT.
 edit_sys.cpp
 Editor Callbacks.cpp
 Editor Modes.cpp
@@ -881,7 +882,7 @@ Creating library...
 --------------------Configuration: Laptop - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP71.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Laptop.pch" /YX"Laptop All.h" /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\JA2\Build\Laptop\aim.cpp"
@@ -942,8 +943,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A.tmp" with content
 "C:\JA2\Build\Laptop\sirtech.cpp"
 "C:\JA2\Build\Laptop\Store Inventory.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP71.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP72.tmp" with contents
 [
 /nologo /out:"Release\Laptop.lib" 
 .\Release\aim.obj
@@ -1004,7 +1005,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B.tmp" with content
 .\Release\sirtech.obj
 ".\Release\Store Inventory.obj"
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP72.tmp"
 <h3>Output Window</h3>
 Compiling...
 aim.cpp
@@ -1070,7 +1071,7 @@ Creating library...
 --------------------Configuration: Strategic - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1C.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP73.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Strategic.pch" /YX"Strategic All.h" /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\JA2\Build\Strategic\AI Viewer.cpp"
@@ -1117,8 +1118,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1C.tmp" with content
 "C:\JA2\Build\Strategic\strategicmap.cpp"
 "C:\JA2\Build\Strategic\Town Militia.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1C.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP73.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP74.tmp" with contents
 [
 /nologo /out:"Release\Strategic.lib" 
 ".\Release\AI Viewer.obj"
@@ -1165,7 +1166,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp" with content
 .\Release\strategicmap.obj
 ".\Release\Town Militia.obj"
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP74.tmp"
 <h3>Output Window</h3>
 Compiling...
 AI Viewer.cpp
@@ -1218,7 +1219,7 @@ Creating library...
 </h3>
 <h3>Command Lines</h3>
 Creating command line "rc.exe /l 0x409 /fo"Release/ja2.res" /i "Res" /i ".\Res" /d "NDEBUG" "C:\JA2\Build\Res\ja2.rc"" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1E.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP75.tmp" with contents
 [
 /nologo /G5 /MT /W3 /GX /Zi /O2 /Ob2 /I ".\Standard Gaming Platform" /I ".\TileEngine" /I ".\Tactical" /I ".\Utils" /I ".\TacticalAI" /I ".\Editor" /I ".\Strategic" /I ".\laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/JA2.pch" /YX"JA2 All.h" /Fo"Release/" /Fd"Release/" /FD /O2b2 /c 
 "C:\JA2\Build\Utils\_Ja25GermanText.cpp"
@@ -1245,8 +1246,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1E.tmp" with content
 "C:\JA2\Build\SCREENS.cpp"
 "C:\JA2\Build\Sys Globals.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1E.tmp" 
-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1F.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP75.tmp" 
+Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP76.tmp" with contents
 [
 libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib smackw32.lib mss32.lib /nologo /subsystem:windows /profile /map:"Release/ja2_cvs.map" /machine:I386 /out:"..\ja2_cvs.exe" 
 .\Release\_Ja25GermanText.obj
@@ -1283,7 +1284,7 @@ libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advap
 .\Laptop\Release\Laptop.lib
 .\Strategic\Release\Strategic.lib
 ]
-Creating command line "link.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1F.tmp"
+Creating command line "link.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP76.tmp"
 <h3>Output Window</h3>
 Compiling resources...
 Compiling...
@@ -1306,6 +1307,7 @@ Init.cpp
 Intro.cpp
 JA2 Splash.cpp
 jascreens.cpp
+C:\JA2\Build\jascreens.cpp(269) : warning C4101: 'str' : unreferenced local variable
 Loading Screen.cpp
 MainMenuScreen.cpp
 MessageBoxScreen.cpp
@@ -1320,7 +1322,7 @@ LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF
 
 
 <h3>Results</h3>
-ja2_cvs.exe - 0 error(s), 1 warning(s)
+ja2_cvs.exe - 0 error(s), 2 warning(s)
 </pre>
 </body>
 </html>
diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp
index 5d8f0dfdf..4cc221c65 100644
--- a/Strategic/Strategic Merc Handler.cpp	
+++ b/Strategic/Strategic Merc Handler.cpp	
@@ -414,7 +414,10 @@ void MercDailyUpdate()
 				if (pProfile->bMercStatus == MERC_WORKING_ELSEWHERE)
 				{
 					// check if he's killed
-					HandleUnhiredMercDeaths( cnt );
+
+					//Kaiden: Externalized if Mercs get killed
+					if (gGameExternalOptions.gfMercsDieOnAssignment)
+						HandleUnhiredMercDeaths( cnt );
 				}
 			}
 		}
diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp
index 3c6985323..86579e4f1 100644
--- a/Tactical/Campaign.cpp
+++ b/Tactical/Campaign.cpp
@@ -1165,17 +1165,17 @@ void HandleUnhiredMercDeaths( INT32 iProfileID )
 	// how many in total can be killed like this depends on player's difficulty setting
 	switch( gGameOptions.ubDifficultyLevel )
 	{
-		case DIF_LEVEL_EASY:
-			ubMaxDeaths = 1;
+		case DIF_LEVEL_EASY:  //Kaiden Externalized ubMaxDeaths Values
+			ubMaxDeaths = gGameExternalOptions.giEasyMercDeaths;
 			break;
 		case DIF_LEVEL_MEDIUM:
-			ubMaxDeaths = 2;
+			ubMaxDeaths = gGameExternalOptions.giExperiencedMercDeaths;
 			break;
 		case DIF_LEVEL_HARD:
-			ubMaxDeaths = 3;
+			ubMaxDeaths = gGameExternalOptions.giExpertMercDeaths;
 			break;
 		case DIF_LEVEL_INSANE:
-			ubMaxDeaths = 3;
+			ubMaxDeaths = gGameExternalOptions.giInsaneMercDeaths;
 			break;
 		default:
 			Assert(FALSE);
diff --git a/builddefines.h b/builddefines.h
index aebb259d7..5cd0d5fd3 100644
--- a/builddefines.h
+++ b/builddefines.h
@@ -4,13 +4,13 @@
 #include "Language Defines.h"
 
 // Beta version
-//#define	JA2BETAVERSION
+#define	JA2BETAVERSION
 
 // Normal test version
 // #define JA2TESTVERSION
 
 // If we want to include the editor
-//#define JA2EDITOR
+#define JA2EDITOR
 
 #ifdef _DEBUG
 	#ifndef JA2TESTVERSION