diff --git a/GameSettings.cpp b/GameSettings.cpp
index 147a0ff04..f8692eb3d 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -536,7 +536,7 @@ 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", 2);
+	gGameExternalOptions.ubSoldierTooltipDetailLevel		= iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 1);
 
 	gGameExternalOptions.fEnableDynamicSoldierTooltips		= iniReader.ReadBoolean("JA2 Tactical Settings", "DYNAMIC_SOLDIER_TOOLTIPS", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipLocation		= iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_LOCATION", TRUE);
diff --git a/GameVersion.cpp b/GameVersion.cpp
index a5902e92e..46053e3e8 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.538" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.541" };
 
 
 #endif
 
-INT8		czVersionNumber[16]	= { "Build 06.09.19" };
+INT8		czVersionNumber[16]	= { "Build 06.09.20" };
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/JA2.suo b/JA2.suo
index 745808afa..f7ded1e2e 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp
index 5f667b1e5..e97653e42 100644
--- a/Tactical/Inventory Choosing.cpp	
+++ b/Tactical/Inventory Choosing.cpp	
@@ -2978,6 +2978,7 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo
 	UINT16 usItem = 0;
 	UINT32 uiChoice;
 	UINT16 defaultItem = 0;
+	BOOLEAN pickItem = FALSE;
 
 	if ( gArmyItemChoices[ typeIndex ].ubChoices <= 0 )
 		return 0;
@@ -2991,6 +2992,7 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo
 
 		// a chance for nothing!
 		uiChoice = Random(gArmyItemChoices[ typeIndex ].ubChoices + (int) ( gArmyItemChoices[ typeIndex ].ubChoices / 3 ));
+		
 		if ( uiChoice >= gArmyItemChoices[ typeIndex ].ubChoices )
 		{	
 			if ( !getMatchingCoolness )
@@ -3000,8 +3002,37 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo
 		}
 		usItem = gArmyItemChoices[ typeIndex ].bItemNo[ uiChoice ];
 
+		// WANNE
+		if (usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem))
+		{
+			// On day
+			if (DayTime() == TRUE)
+			{
+				// Only pick items, that have not a negative day vision bonus range
+				// So we only pick normal items and day items (sun googles, ...)
+				if (Item[usItem].dayvisionrangebonus >= 0 )
+				{
+					pickItem = TRUE;
+				}
+			}
+			// At night
+			else
+			{
+				// Only pick items, that have not a negative night vision bonus range
+				// So we only pick normal items and night items (NVG, ...)
+				if (Item[usItem].nightvisionrangebonus >= 0 )
+				{
+					pickItem = TRUE;
+				}
+			}
+		}
+
+
 		//Madd: quickfix: don't use NVGs during the day, and no sungoggles at night either
-		if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && (( DayTime() && Item[usItem].nightvisionrangebonus == 0 ) || ( NightTime() && Item[usItem].dayvisionrangebonus == 0 )))
+		//if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && (( DayTime() && Item[usItem].nightvisionrangebonus == 0 ) || ( NightTime() && Item[usItem].dayvisionrangebonus == 0 )))
+		
+		// WANNE
+		if (pickItem == TRUE)
 		{
 			// pick a default item in case we don't find anything with a matching coolness, but pick the coolest item we can find
 			if ( defaultItem == 0 || Item[usItem].ubCoolness > Item[defaultItem].ubCoolness )
diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index ce7aea716..f0e47fd14 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -3460,6 +3460,7 @@ STR16		zOptionsToggleText[] =
 	L"Show Weapon Ranges in Tiles",
 	L"Tracer effect for single shot",
 	L"Rain noises",
+	L"Random I.M.P personality",
 };
 
 //This is the help text associated with the above toggles.
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index 7f9f757ae..3b4249632 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -3449,6 +3449,7 @@ STR16		zOptionsToggleText[] =
 	L"Show Weapon Ranges in Tiles",
 	L"Tracer effect for single shot",
 	L"Rain noises",
+	L"Random I.M.P personality",
 };
 
 //This is the help text associated with the above toggles.
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index d12f96b24..00b84fc16 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -3269,6 +3269,7 @@ STR16 zOptionsToggleText[] =
 	L"Tracereffekte für Einzelschüsse",
 	L"Regengeräusche",
 	L"Krähen erlauben",
+	L"Zufällige B.S.E Personalität",
 };
 
 //This is the help text associated with the above toggles.
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 436916c0a..5070bee8c 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -3442,6 +3442,7 @@ STR16		zOptionsToggleText[] =
 	L"Show Weapon Ranges in Tiles",
 	L"Tracer effect for single shot",
 	L"Rain noises",
+	L"Random I.M.P personality",
 };
 
 //This is the help text associated with the above toggles.
@@ -3517,7 +3518,7 @@ STR16	zOptionsScreenHelpText[] =
 	L"When ON, weapon ranges will be shown in tiles.",
 	L"When ON, tracer effect will be shown for single shots.",
 	L"When ON, you will hear rain noises when it is raining.",
-
+	L"When ON, I.M.P characters will get random personality and attitude.",
 };
 
 
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index af43e8f92..e827a4030 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -3442,6 +3442,7 @@ STR16		zOptionsToggleText[] =
 	L"Show Weapon Ranges in Tiles",
 	L"Tracer effect for single shot",
 	L"Rain noises",
+	L"Random I.M.P personality",
 };
 
 //This is the help text associated with the above toggles.
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index 96406328a..70f8ba4ad 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -3453,6 +3453,7 @@ STR16		zOptionsToggleText[] =
 	L"Tracer effect for single shot",
 	L"Rain noises",
 	L"Allow crows",
+	L"Random I.M.P personality",
 };
 
 //This is the help text associated with the above toggles.