diff --git a/GameSettings.cpp b/GameSettings.cpp
index f8692eb3..a8e70096 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -536,9 +536,8 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.fVehicleInventory					= iniReader.ReadBoolean("JA2 Gameplay Settings", "VEHICLE_INVENTORY", TRUE);
 
 	// ShadoWarrior: Tooltip changes (start)
-	gGameExternalOptions.ubSoldierTooltipDetailLevel		= iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 1);
+	gGameExternalOptions.ubSoldierTooltipDetailLevel		= iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 2);
 
-	gGameExternalOptions.fEnableDynamicSoldierTooltips		= iniReader.ReadBoolean("JA2 Tactical Settings", "DYNAMIC_SOLDIER_TOOLTIPS", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipLocation		= iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_LOCATION", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipBrightness	= iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_BRIGHTNESS", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipRangeToTarget	= iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_RANGE_TO_TARGET", TRUE);
diff --git a/GameSettings.h b/GameSettings.h
index c5a615eb..152a8586 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -143,7 +143,6 @@ typedef struct
 	BOOLEAN fSellAll;
 	INT16 iPriceModifier;
 
-	INT32 iMaxIMPMaleCharacters;
 	INT32 iMaxIMPCharacters;
 	INT32 iMinAttribute;
 	INT32 iMaxAttribute;
@@ -351,7 +350,6 @@ typedef struct
 	// ShadoWarrior: Tooltip changes (start)
 	UINT8 ubSoldierTooltipDetailLevel;
 
-	BOOLEAN fEnableDynamicSoldierTooltips;
 	BOOLEAN fEnableSoldierTooltipLocation;
 	BOOLEAN fEnableSoldierTooltipBrightness;
 	BOOLEAN fEnableSoldierTooltipRangeToTarget;
diff --git a/GameVersion.cpp b/GameVersion.cpp
index 796a203c..ef91fddb 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,12 +23,12 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION 
-	INT16		zVersionLabel[256]		= { L"Release v1.13.529" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.536" };
 
 
 #endif
 
-INT8		czVersionNumber[16]	= { "Build 06.09.17" };
+INT8		czVersionNumber[16]	= { "Build 06.09.18" };
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/JA2.suo b/JA2.suo
index a7f6ead5..1e933d5e 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/Tactical/Item Types.h b/Tactical/Item Types.h
index 4b9fa903..df72f7ce 100644
--- a/Tactical/Item Types.h	
+++ b/Tactical/Item Types.h	
@@ -289,6 +289,7 @@ typedef struct
 	BOOLEAN twohanded;
 	BOOLEAN notbuyable;
 	BOOLEAN attachment;
+	BOOLEAN hiddenattachment;
 	BOOLEAN biggunlist;
 	BOOLEAN notineditor;
 	BOOLEAN defaultundroppable;
diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp
index 29b6b493..0d60df6f 100644
--- a/Tactical/SoldierTooltips.cpp
+++ b/Tactical/SoldierTooltips.cpp
@@ -49,7 +49,8 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 		if ( gusSelectedSoldier != NOBODY )
 			iRangeToTarget = GetRangeInCellCoordsFromGridNoDiff( MercPtrs[ gusSelectedSoldier ]->sGridNo, sSoldierGridNo ) / 10;
 
-		if ( gGameExternalOptions.fEnableDynamicSoldierTooltips )
+		// WANNE NEW
+		//if ( gGameExternalOptions.fEnableDynamicSoldierTooltips )
 		{
 			for ( INT32 cnt = 0; cnt < MAX_ATTACHMENTS; cnt++ )
 			{
@@ -297,10 +298,6 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 
 void DisplayWeaponInfo( SOLDIERTYPE* pSoldier, CHAR16* pStrInfo, UINT8 ubSlot, UINT8 ubTooltipDetailLevel )
 {
-	const int	TriggerGroup		= 1026;
-	const int	GunBarrelExtender	= 310;
-	const int	CMagAdapter556mm	= 1001;
-	const int	CMagAdapter9mm		= 1002;
 	INT32		iNumAttachments		= 0;
 	BOOLEAN		fDisplayAttachment	= FALSE;
 
@@ -358,31 +355,9 @@ void DisplayWeaponInfo( SOLDIERTYPE* pSoldier, CHAR16* pStrInfo, UINT8 ubSlot, U
 				if ( ubTooltipDetailLevel == DL_Basic )
 				{
 					// display only externally-visible weapon attachments
-					// don't display inseparable attachments such as the integral GLs on OICW & AICW
-					if ( !Item[pSoldier->inv[ubSlot].usAttachItem[ cnt ]].inseparable )
-					{
-						if ( pSoldier->inv[ubSlot].usAttachItem[ cnt ] != TriggerGroup )
+					if ( !Item[pSoldier->inv[ubSlot].usAttachItem[ cnt ]].hiddenattachment )
 						{
 							fDisplayAttachment = TRUE;
-						}
-					}
-					else
-					{
-						// display C-mags and barrel extensions
-						switch( pSoldier->inv[ubSlot].usAttachItem[ cnt ] )
-						{
-							case GunBarrelExtender:
-								fDisplayAttachment = TRUE;
-								break;
-							case CMagAdapter556mm:
-								fDisplayAttachment = TRUE;
-								break;
-							case CMagAdapter9mm:
-								fDisplayAttachment = TRUE;
-								break;
-							default:
-								break;
-						}
 					}
 				}
 				else
diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp
index 221660dd..ea453b07 100644
--- a/Utils/XML_Items.cpp
+++ b/Utils/XML_Items.cpp
@@ -117,6 +117,7 @@ itemStartElementHandle(void *userData, const char *name, const char **atts)
 				strcmp(name, "TwoHanded") == 0 ||
 				strcmp(name, "NotBuyable") == 0 ||
 				strcmp(name, "Attachment") == 0 ||
+				strcmp(name, "HiddenAttachment") == 0 ||
 				strcmp(name, "BigGunList") == 0 ||
 				strcmp(name, "NotInEditor") == 0 ||
 				strcmp(name, "DefaultUndroppable") == 0 ||
@@ -511,6 +512,11 @@ itemEndElementHandle(void *userData, const char *name)
 			pData->curElement = ELEMENT;
 			pData->curItem.attachment = (BOOLEAN) atol(pData->szCharData);
 		}
+		else if(strcmp(name, "HiddenAttachment")	 == 0)
+		{
+			pData->curElement = ELEMENT;
+			pData->curItem.hiddenattachment = (BOOLEAN) atol(pData->szCharData);
+		}
 		else if(strcmp(name, "BigGunList")	 == 0)
 		{
 			pData->curElement = ELEMENT;