diff --git a/GameSettings.cpp b/GameSettings.cpp
index 55a775b9..7f13c0e7 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -1632,17 +1632,28 @@ void LoadGameExternalOptions()
 
 	//################# Laptop Settings ##################
 
-	gGameExternalOptions.gBriefingRoom						= iniReader.ReadBoolean("Laptop Settings", "BRIEFING_ROOM", FALSE);
+#ifdef ENABLE_BRIEFINGROOM
+	if (!is_networked)
+		gGameExternalOptions.gBriefingRoom					= iniReader.ReadBoolean("Laptop Settings", "BRIEFING_ROOM", FALSE);
+	else
+		gGameExternalOptions.gBriefingRoom					= FALSE;
+#else
+	gGameExternalOptions.gBriefingRoom						= FALSE;
+#endif
+	
 #ifdef ENABLE_ENCYCLOPEDIA
-	gGameExternalOptions.gEncyclopedia						= iniReader.ReadBoolean("Laptop Settings", "ENCYCLOPEDIA", FALSE);
+	if (!is_networked)
+		gGameExternalOptions.gEncyclopedia					= iniReader.ReadBoolean("Laptop Settings", "ENCYCLOPEDIA", FALSE);
+	else
+		gGameExternalOptions.gEncyclopedia					= FALSE;
 #else
 	gGameExternalOptions.gEncyclopedia						= FALSE;
 #endif
+
 	gGameExternalOptions.fDisableLaptopTransition			= iniReader.ReadBoolean("Laptop Settings", "DISABLE_LAPTOP_TRANSITION", FALSE);
 	gGameExternalOptions.fFastWWWSitesLoading				= iniReader.ReadBoolean("Laptop Settings", "FAST_WWW_SITES_LOADING", FALSE);
 	gGameExternalOptions.fLaptopMouseCaptured				= iniReader.ReadBoolean("Laptop Settings", "LAPTOP_MOUSE_CAPTURED", FALSE);
 
-
 	//################# Bobby Ray Settings ##################
 
 
diff --git a/Init.cpp b/Init.cpp
index ec42ce7a..fa007f78 100644
--- a/Init.cpp
+++ b/Init.cpp
@@ -1262,6 +1262,9 @@ if ( ReadXMLEmail == TRUE )
 		}
 #endif
 
+#endif //ENABLE_ENCYCLOPEDIA
+
+#ifdef ENABLE_BRIEFINGROOM
 	strcpy(fileName, directoryName);
 	strcat(fileName, BRIEFINGROOMFILENAME);
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
@@ -1275,7 +1278,8 @@ if ( ReadXMLEmail == TRUE )
 			SGP_THROW_IFFALSE(ReadInEncyclopediaLocation(fileName,TRUE,gBriefingRoomData, 4), fileName);
 		}
 #endif
-#endif //ENABLE_ENCYCLOPEDIA
+
+#endif //ENABLE_BRIEFINGROOM
 
 		UINT8 p;
 		for(p=0; p<NUM_PROFILES; p++)
diff --git a/Laptop/BriefingRoomM.cpp b/Laptop/BriefingRoomM.cpp
index b57e1846..4e9292f3 100644
--- a/Laptop/BriefingRoomM.cpp
+++ b/Laptop/BriefingRoomM.cpp
@@ -253,7 +253,7 @@ void RenderBriefingRoomEnter()
 	
 	ShadowVideoSurfaceRect( FRAME_BUFFER, BRIEFINGROOM_MISSION_LOCATION_BOX_X+BRIEFINGROOM_MISSION_LOCATION_BOX_SHADOW_GAP+150, BRIEFINGROOM_MISSION_LOCATION_BOX_Y + 13 + BRIEFINGROOM_MISSION_LOCATION_BOX_SHADOW_GAP - 227 , BRIEFINGROOM_MISSION_LOCATION_BOX_X + 400 + BRIEFINGROOM_MISSION_LOCATION_BOX_SHADOW_GAP, BRIEFINGROOM_MISSION_LOCATION_BOX_Y + BRIEFINGROOM_MISSION_LOCATION_BOX_SHADOW_GAP-42);
 
-	DisplayWrappedString(BRIEFINGROOM_MISSION_BOX_DESC_X + 150, BRIEFINGROOM_MISSION_BOX_DESC_Y - 210, BRIEFINGROOM_MISSION_BOX_TEXT_WIDTH, 6, BRIEFINGROOM_MISSION_BOX_FONT, BRIEFINGROOM_MISSION_BOX_COLOR, L"Test box!", FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+	DisplayWrappedString(BRIEFINGROOM_MISSION_BOX_DESC_X + 150, BRIEFINGROOM_MISSION_BOX_DESC_Y - 210, BRIEFINGROOM_MISSION_BOX_TEXT_WIDTH, 6, BRIEFINGROOM_MISSION_BOX_FONT, BRIEFINGROOM_MISSION_BOX_COLOR, pSectorPageText[6], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 
 	
 	
@@ -660,4 +660,4 @@ void ResetActivationBriefingRoomEnterStringTextBox(void)
 	uiCursorBriefingRoomEnterPosition = StringPixLength( pPlayerBriefingRoomEnterActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X;
 	DisplayPlayerActivationBriefingRoomEnterString();
 	DisplayActivationBriefingRoomEnterStringCursor();
-}
+}
diff --git a/Laptop/Encyclopedia.cpp b/Laptop/Encyclopedia.cpp
index 5c62bb86..051449be 100644
--- a/Laptop/Encyclopedia.cpp
+++ b/Laptop/Encyclopedia.cpp
@@ -67,33 +67,34 @@ BOOLEAN		fFirstTimeInEncyclopedia = TRUE;
 
 BOOLEAN DrawEncyclopediaLogoAim();
 
-#ifdef ENABLE_ENCYCLOPEDIA
-
-ENCYCLOPEDIA_LOCATION gEncyclopediaLocationData[ NUM_SECTOR ];
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 ENCYCLOPEDIA_LOCATION gEncyclopediaDataTemp[ NUM_MAX_TEMP ];
+#endif
+
+#ifdef ENABLE_ENCYCLOPEDIA
+ENCYCLOPEDIA_LOCATION gEncyclopediaLocationData[ NUM_SECTOR ];
 ENCYCLOPEDIA_LOCATION gEncyclopediaProfilesData[ NUM_PROFILES ];
 ENCYCLOPEDIA_LOCATION gEncyclopediaInventoryData[ MAXITEMS ];
 ENCYCLOPEDIA_LOCATION gEncyclopediaOldProfilesData[ NUM_PROFILES ];
 ENCYCLOPEDIA_LOCATION gEncyclopediaQuestsData[ MAX_QUESTS ];
-ENCYCLOPEDIA_LOCATION gBriefingRoomData[ NUM_SECTOR ];
-ENCYCLOPEDIA_LOCATION gBriefingRoomSpecialMissionData[ NUM_SECTOR ];
-
-BOOLEAN saveEncyclopediaLocationData[ NUM_SECTOR ];
 ENCYCLOPEDIA_PROF_SAVE saveEncyclopediaProfilesData[ NUM_PROFILES ];
+BOOLEAN saveEncyclopediaLocationData[ NUM_SECTOR ];
 BOOLEAN saveEncyclopediaInventoryData[ MAXITEMS ];
 BOOLEAN saveEncyclopediaOldProfilesData[ NUM_PROFILES ];
 BOOLEAN saveEncyclopediaQuestsData[ MAX_QUESTS ];
+#else
+ENCYCLOPEDIA_LOCATION gEncyclopediaProfilesData[ 1 ];
+#endif // ENABLE_ENCYCLOPEDIA
+
+#ifdef ENABLE_BRIEFINGROOM
+ENCYCLOPEDIA_LOCATION gBriefingRoomData[ NUM_SECTOR ];
+ENCYCLOPEDIA_LOCATION gBriefingRoomSpecialMissionData[ NUM_SECTOR ];
 MISSION_SAVE saveBriefingRoomData[ NUM_SECTOR ];
 MISSION_SAVE saveBriefingRoomSpecialMissionData[ NUM_SECTOR ];
-
 MISSION_SAVE saveMissionData[ NUM_SECTOR ];
-
-#else // ENABLE_ENCYCLOPEDIA
-
-ENCYCLOPEDIA_LOCATION gEncyclopediaProfilesData[ 1 ];
+#else
 ENCYCLOPEDIA_LOCATION gBriefingRoomData[ 1 ];
-
-#endif // ENABLE_ENCYCLOPEDIA
+#endif // ENABLE_BRIEFINGROOM
 
 void GameInitEncyclopedia()
 {
@@ -341,7 +342,8 @@ void SelectEncyclopediaInentoryButton(MOUSE_REGION * pRegion, INT32 iReason )
 
 BOOLEAN InitEncyclopediaDefaults()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
   VOBJECT_DESC    VObjectDesc;
 
 	// load the Rust bacground graphic and add it
@@ -356,7 +358,8 @@ BOOLEAN InitEncyclopediaDefaults()
 
 BOOLEAN RemoveEncyclopediaDefaults()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	DeleteVideoObjectFromIndex(guiRustEncyclopediaBackGround);
 #endif // ENABLE_ENCYCLOPEDIA
 	return(TRUE);
@@ -378,7 +381,8 @@ BOOLEAN DrawEncyclopediaLogoAim()
 
 BOOLEAN DrawEncyclopediaDefaults()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
   HVOBJECT hRustBackGroundHandle;
 // UINT16	x,y, uiPosX, uiPosY;
 
diff --git a/Laptop/Encyclopedia.h b/Laptop/Encyclopedia.h
index 5a999087..687f565b 100644
--- a/Laptop/Encyclopedia.h
+++ b/Laptop/Encyclopedia.h
@@ -32,7 +32,7 @@ BOOLEAN DisplayEncyclopediaCopyright();
 #define		NUM_SECTOR									4*255
 #define 	MAX_ENCYCLOPEDIA_CHARS		500
 
-#define NUM_MAX_TEMP	10000
+#define NUM_MAX_TEMP	MAXITEMS+1
 
 #define TEXT_NUM_ENC TEXT_NUM_ENCYCLOPEDIA_HELP_TEXT
 
@@ -91,11 +91,12 @@ typedef struct
 	
 	CHAR16		Name[ENCYCLOPEDIA_NAME_SIZE];
 	
+	
 	CHAR16		sDesc1[ENCYCLOPEDIA_DECRIPTION_SIZE];
 	CHAR16		sDesc2[ENCYCLOPEDIA_DECRIPTION_SIZE];
 	CHAR16		sDesc3[ENCYCLOPEDIA_DECRIPTION_SIZE];
 	CHAR16		sDesc4[ENCYCLOPEDIA_DECRIPTION_SIZE];
-	CHAR16		sDesc5[ENCYCLOPEDIA_DECRIPTION_SIZE];
+/*	CHAR16		sDesc5[ENCYCLOPEDIA_DECRIPTION_SIZE];
 	CHAR16		sDesc6[ENCYCLOPEDIA_DECRIPTION_SIZE];
 	CHAR16		sDesc7[ENCYCLOPEDIA_DECRIPTION_SIZE];
 	CHAR16		sDesc8[ENCYCLOPEDIA_DECRIPTION_SIZE];
@@ -111,6 +112,7 @@ typedef struct
 	CHAR16		sDesc18[ENCYCLOPEDIA_DECRIPTION_SIZE];
 	CHAR16		sDesc19[ENCYCLOPEDIA_DECRIPTION_SIZE];	
 	CHAR16		sDesc20[ENCYCLOPEDIA_DECRIPTION_SIZE];
+	*/
 	
 	BOOLEAN   	Hidden;
 	
@@ -203,7 +205,33 @@ extern void InitEncyklopediaBool();
 
 extern void ShowNPCEncyclopediaEntry(UINT8 ubNPC, BOOLEAN hidden);
 
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
+extern ENCYCLOPEDIA_LOCATION gEncyclopediaDataTemp[ NUM_MAX_TEMP ];
+#endif
+
+#ifdef ENABLE_ENCYCLOPEDIA
+extern ENCYCLOPEDIA_LOCATION gEncyclopediaLocationData[ NUM_SECTOR ];
+extern ENCYCLOPEDIA_LOCATION gEncyclopediaProfilesData[ NUM_PROFILES ];
+extern ENCYCLOPEDIA_LOCATION gEncyclopediaInventoryData[ MAXITEMS ];
+extern ENCYCLOPEDIA_LOCATION gEncyclopediaOldProfilesData[ NUM_PROFILES ];
+extern ENCYCLOPEDIA_LOCATION gEncyclopediaQuestsData[ MAX_QUESTS ];
+extern BOOLEAN saveEncyclopediaLocationData[ NUM_SECTOR ];
+extern ENCYCLOPEDIA_PROF_SAVE saveEncyclopediaProfilesData[ NUM_PROFILES ];
+extern BOOLEAN saveEncyclopediaInventoryData[ MAXITEMS ];
+extern BOOLEAN saveEncyclopediaOldProfilesData[ NUM_PROFILES ];
+extern BOOLEAN saveEncyclopediaQuestsData[ MAX_QUESTS ];
+#else
 extern ENCYCLOPEDIA_LOCATION gEncyclopediaProfilesData[];
+#endif // ENABLE_ENCYCLOPEDIA
+
+#ifdef ENABLE_BRIEFINGROOM
+extern ENCYCLOPEDIA_LOCATION gBriefingRoomData[ NUM_SECTOR ];
+extern ENCYCLOPEDIA_LOCATION gBriefingRoomSpecialMissionData[ NUM_SECTOR ];
+extern MISSION_SAVE saveBriefingRoomData[ NUM_SECTOR ];
+extern MISSION_SAVE saveBriefingRoomSpecialMissionData[ NUM_SECTOR ];
+extern MISSION_SAVE saveMissionData[ NUM_SECTOR ];
+#else
 extern ENCYCLOPEDIA_LOCATION gBriefingRoomData[];
+#endif // ENABLE_BRIEFINGROOM
 
 #endif
\ No newline at end of file
diff --git a/Laptop/Encyclopedia_Data.cpp b/Laptop/Encyclopedia_Data.cpp
index 58e349ba..4b3cb2eb 100644
--- a/Laptop/Encyclopedia_Data.cpp
+++ b/Laptop/Encyclopedia_Data.cpp
@@ -16,6 +16,8 @@
 #include "Encyclopedia.h"
 #include "Quests.h"
 
+#include "Tactical Save.h"
+
 #define MAX_FILTR_LOCATION_BUTTONS 11
 #define FILTR_INVENTORY_BUTTONS 5
 #define FILTR_BUTTONS_CHARACTER 8
@@ -131,7 +133,8 @@ void GameInitEncyclopediaLocation()
 
 void ResetTemp()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 
 UINT32 i,NUM_TEMP;
 
@@ -158,11 +161,13 @@ UINT32 i,NUM_TEMP;
 			//strncpy(gEncyclopediaLocationTextTemp[i].szFile4, '\0',MAX_ENCYCLOPEDIA_CHARS);
 			
 			gEncyclopediaDataTemp[i].Name[ENCYCLOPEDIA_NAME_SIZE]  = '\0';
+			
+			
 			gEncyclopediaDataTemp[i].sDesc1[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sDesc2[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sDesc3[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sDesc4[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
-			gEncyclopediaDataTemp[i].sDesc5[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
+		/*	gEncyclopediaDataTemp[i].sDesc5[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sDesc6[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sDesc7[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sDesc8[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
@@ -178,6 +183,7 @@ UINT32 i,NUM_TEMP;
 			gEncyclopediaDataTemp[i].sDesc18[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sDesc19[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sDesc20[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
+		*/
 			
 			gEncyclopediaDataTemp[i].sImageDesc1[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
 			gEncyclopediaDataTemp[i].sImageDesc2[ENCYCLOPEDIA_DECRIPTION_SIZE] = '\0';
@@ -244,7 +250,8 @@ UINT32 i,NUM_TEMP;
 
 void CopyToTemp ( ENCYCLOPEDIA_LOCATION *Ency, BOOLEAN bFiltr, INT32 sort, INT32 TypFiltr, BOOLEAN ShowBox )
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	UINT32 i, NUM_TEMP;
 	INT32 IDClass;
 	BOOLEAN bBoxShow;
@@ -580,11 +587,12 @@ void CopyToTemp ( ENCYCLOPEDIA_LOCATION *Ency, BOOLEAN bFiltr, INT32 sort, INT32
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].ImageDescAfter, Ency[i].ImageDescAfter);
 			
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].Name, Ency[i].Name);
+			
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc1, Ency[i].sDesc1);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc2, Ency[i].sDesc2);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc3, Ency[i].sDesc3);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc4, Ency[i].sDesc4);
-			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc5, Ency[i].sDesc5);
+		/*	wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc5, Ency[i].sDesc5);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc6, Ency[i].sDesc6);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc7, Ency[i].sDesc7);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc8, Ency[i].sDesc8);
@@ -600,6 +608,7 @@ void CopyToTemp ( ENCYCLOPEDIA_LOCATION *Ency, BOOLEAN bFiltr, INT32 sort, INT32
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc18, Ency[i].sDesc18);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc19, Ency[i].sDesc19);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sDesc20, Ency[i].sDesc20);
+			*/
 			
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sImageDesc1, Ency[i].sImageDesc1);
 			wcscpy(gEncyclopediaDataTemp[MaxLocation].sImageDesc2, Ency[i].sImageDesc2);
@@ -859,7 +868,8 @@ BOOLEAN  RenderFiltrBox()
 
 void InitData ( BOOLEAN bInit)
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 
   IDimage = 1;
   MaxImages = 1;
@@ -878,17 +888,41 @@ void InitData ( BOOLEAN bInit)
   ResetTemp();
   
   if ( bEncyclopediaLocation == TRUE )
+	{
+		#ifdef ENABLE_ENCYCLOPEDIA
 		CopyToTemp (gEncyclopediaLocationData, TRUE, NONE_FILTR , NO_FILTR, FALSE );
+		#endif
+	}
   else if ( bEncyclopediaCharacter == TRUE )
+	{
+		#ifdef ENABLE_ENCYCLOPEDIA
 		CopyToTemp (gEncyclopediaProfilesData, TRUE, NONE_FILTR , NO_FILTR, FALSE );
+		#endif
+	}
   else if ( bEncyclopediaInventory == TRUE )
+	{
+		#ifdef ENABLE_ENCYCLOPEDIA
 		CopyToTemp (gEncyclopediaInventoryData, TRUE, NONE_FILTR , NO_FILTR, FALSE );
+		#endif
+	}
   else if ( bEncyclopediaQuests == TRUE )
+	{
+		#ifdef ENABLE_ENCYCLOPEDIA
 		CopyToTemp (gEncyclopediaQuestsData, TRUE, NONE_FILTR , NO_FILTR, FALSE );
+		#endif
+	}
   else if ( bBriefingRoom == TRUE )
+	{
+		#ifdef ENABLE_BRIEFINGROOM
 		CopyToTemp (gBriefingRoomData, TRUE, NONE_FILTR , NO_FILTR, FALSE );
+		#endif
+	}
   else if ( bBriefingRoomSpecialMission  == TRUE )
+	{
+		#ifdef ENABLE_BRIEFINGROOM
 		CopyToTemp (gBriefingRoomSpecialMissionData, TRUE, NONE_FILTR , NO_FILTR, FALSE );
+		#endif
+	}
   
 	//InitEncyclopediaDefaults();
 	
@@ -912,7 +946,8 @@ void InitData ( BOOLEAN bInit)
 
 BOOLEAN EnterEncyclopediaLocation()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
   UINT16	usPosX, usPosY, i;
   /*
   IDimage = 1;
@@ -1221,7 +1256,8 @@ void HandleEncyclopediaLocation()
 
 void RenderButtonDisabled()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	if ( gEncyclopediaDataTemp[LocationID].sDesc2 == '\0' && gEncyclopediaDataTemp[LocationID].sDesc3 == '\0' ) 
 	{
 		DisableButton( guiEncyclopediaPageButton[0] );
@@ -1236,7 +1272,8 @@ void RenderButtonDisabled()
 
 void RenderButtonDisabled2()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	DisableButton( guiEncyclopediaPageButton[0] );
 	EnableButton( guiEncyclopediaPageButton[2] );
 #endif // ENABLE_ENCYCLOPEDIA
@@ -1244,7 +1281,8 @@ void RenderButtonDisabled2()
 
 void RenderButtonDisabled3()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	DisableButton( guiEncyclopediaLocationPageButton[0] );
 	
 	if ( MaxLocation == -1 || MaxLocation == 0 || MaxLocation == 1 ) 
@@ -1256,7 +1294,8 @@ void RenderButtonDisabled3()
 
 void RenderButtonDisabled4()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	DisableButton( guiEncyclopediaPageButton[0] );
 	DisableButton( guiEncyclopediaPageButton[2] );
 #endif // ENABLE_ENCYCLOPEDIA
@@ -1264,7 +1303,8 @@ void RenderButtonDisabled4()
 
 void RenderBoxDisabledButton()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	MaxImages = 1;
 	MaxLocation = 0;
 	IDimage = 1;
@@ -1281,7 +1321,8 @@ void RenderBoxDisabledButton()
 
 BOOLEAN  RenderMap()
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
   VOBJECT_DESC	VObjectDesc;
   char fileName[500];
 
@@ -1351,7 +1392,8 @@ BOOLEAN  RenderMap()
 
 void RenderEncyclopediaLocation( BOOLEAN bHidden )
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
   UINT16	i;
   UINT8		ubNumLines=11; 
   UINT16	usPosY;
@@ -1492,6 +1534,7 @@ void RenderEncyclopediaLocation( BOOLEAN bHidden )
 	if ( ResetVal == TRUE )
 	DisplayWrappedString(ENCYCLOPEDIA_LOCATION_BOX_X+ENCYCLOPEDIA_LOCATION_BOX_SHADOW_GAP + 3, ENCYCLOPEDIA_LOCATION_BOX_Y + 18 + ENCYCLOPEDIA_LOCATION_BOX_SHADOW_GAP - 50, ENCYCLOPEDIA_LOCATION_BOX_TEXT_WIDTH, 6, ENCYCLOPEDIA_LOCATION_BOX_FONT, ENCYCLOPEDIA_LOCATION_BOX_COLOR, L"", FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 
+	
 	if ( ID == 0 )
 		usStringPixLength = StringPixLength( gEncyclopediaDataTemp[LocationID].sDesc1, ENCYCLOPEDIA_LOCATION_BOX_FONT);
 	else if (ID == 1 && gEncyclopediaDataTemp[LocationID].sDesc2 != '\0' )
@@ -1500,7 +1543,7 @@ void RenderEncyclopediaLocation( BOOLEAN bHidden )
 		usStringPixLength = StringPixLength( gEncyclopediaDataTemp[LocationID].sDesc3, ENCYCLOPEDIA_LOCATION_BOX_FONT);
 	else if (ID == 3 && gEncyclopediaDataTemp[LocationID].sDesc4 != '\0' )
 		usStringPixLength = StringPixLength( gEncyclopediaDataTemp[LocationID].sDesc4, ENCYCLOPEDIA_LOCATION_BOX_FONT);
-	else if (ID == 4 && gEncyclopediaDataTemp[LocationID].sDesc5 != '\0' )
+/*	else if (ID == 4 && gEncyclopediaDataTemp[LocationID].sDesc5 != '\0' )
 		usStringPixLength = StringPixLength( gEncyclopediaDataTemp[LocationID].sDesc5, ENCYCLOPEDIA_LOCATION_BOX_FONT);	
 	else if (ID == 5 && gEncyclopediaDataTemp[LocationID].sDesc6 != '\0' )
 		usStringPixLength = StringPixLength( gEncyclopediaDataTemp[LocationID].sDesc6, ENCYCLOPEDIA_LOCATION_BOX_FONT);
@@ -1532,7 +1575,8 @@ void RenderEncyclopediaLocation( BOOLEAN bHidden )
 		usStringPixLength = StringPixLength( gEncyclopediaDataTemp[LocationID].sDesc19, ENCYCLOPEDIA_LOCATION_BOX_FONT);
 	else if (ID == 19 && gEncyclopediaDataTemp[LocationID].sDesc20 != '\0' )
 		usStringPixLength = StringPixLength( gEncyclopediaDataTemp[LocationID].sDesc20, ENCYCLOPEDIA_LOCATION_BOX_FONT);
-		
+	*/	
+	
 	//reset
 	if ( ResetVal == TRUE )
 	usStringPixLength = StringPixLength( L"", ENCYCLOPEDIA_LOCATION_BOX_FONT);
@@ -1551,6 +1595,7 @@ void RenderEncyclopediaLocation( BOOLEAN bHidden )
 	}
 		
 	if ( ResetVal == FALSE )  {
+	
 	if (ID == 0 )
 		DisplayWrappedString(ENCYCLOPEDIA_LOCATION_BOX_DESC_X, ENCYCLOPEDIA_LOCATION_BOX_DESC_Y + 13, ENCYCLOPEDIA_LOCATION_BOX_TEXT_WIDTH, 6, ENCYCLOPEDIA_LOCATION_BOX_FONT, ENCYCLOPEDIA_LOCATION_BOX_COLOR, gEncyclopediaDataTemp[LocationID].sDesc1, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 	else if ( ID == 1 && gEncyclopediaDataTemp[LocationID].sDesc2 != '\0')
@@ -1559,7 +1604,7 @@ void RenderEncyclopediaLocation( BOOLEAN bHidden )
 		DisplayWrappedString(ENCYCLOPEDIA_LOCATION_BOX_DESC_X, ENCYCLOPEDIA_LOCATION_BOX_DESC_Y + 13, ENCYCLOPEDIA_LOCATION_BOX_TEXT_WIDTH, 6, ENCYCLOPEDIA_LOCATION_BOX_FONT, ENCYCLOPEDIA_LOCATION_BOX_COLOR, gEncyclopediaDataTemp[LocationID].sDesc3, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 	else if ( ID == 3 && gEncyclopediaDataTemp[LocationID].sDesc4 != '\0' )
 		DisplayWrappedString(ENCYCLOPEDIA_LOCATION_BOX_DESC_X, ENCYCLOPEDIA_LOCATION_BOX_DESC_Y + 13, ENCYCLOPEDIA_LOCATION_BOX_TEXT_WIDTH, 6, ENCYCLOPEDIA_LOCATION_BOX_FONT, ENCYCLOPEDIA_LOCATION_BOX_COLOR, gEncyclopediaDataTemp[LocationID].sDesc4, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
-	else if ( ID == 4 && gEncyclopediaDataTemp[LocationID].sDesc5 != '\0' )
+/*	else if ( ID == 4 && gEncyclopediaDataTemp[LocationID].sDesc5 != '\0' )
 		DisplayWrappedString(ENCYCLOPEDIA_LOCATION_BOX_DESC_X, ENCYCLOPEDIA_LOCATION_BOX_DESC_Y + 13, ENCYCLOPEDIA_LOCATION_BOX_TEXT_WIDTH, 6, ENCYCLOPEDIA_LOCATION_BOX_FONT, ENCYCLOPEDIA_LOCATION_BOX_COLOR, gEncyclopediaDataTemp[LocationID].sDesc5, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 	else if ( ID == 5 && gEncyclopediaDataTemp[LocationID].sDesc6 != '\0' )
 		DisplayWrappedString(ENCYCLOPEDIA_LOCATION_BOX_DESC_X, ENCYCLOPEDIA_LOCATION_BOX_DESC_Y + 13, ENCYCLOPEDIA_LOCATION_BOX_TEXT_WIDTH, 6, ENCYCLOPEDIA_LOCATION_BOX_FONT, ENCYCLOPEDIA_LOCATION_BOX_COLOR, gEncyclopediaDataTemp[LocationID].sDesc6, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
@@ -1591,6 +1636,7 @@ void RenderEncyclopediaLocation( BOOLEAN bHidden )
 		DisplayWrappedString(ENCYCLOPEDIA_LOCATION_BOX_DESC_X, ENCYCLOPEDIA_LOCATION_BOX_DESC_Y + 13, ENCYCLOPEDIA_LOCATION_BOX_TEXT_WIDTH, 6, ENCYCLOPEDIA_LOCATION_BOX_FONT, ENCYCLOPEDIA_LOCATION_BOX_COLOR, gEncyclopediaDataTemp[LocationID].sDesc19, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 	else if ( ID == 19 && gEncyclopediaDataTemp[LocationID].sDesc20 != '\0' )
 		DisplayWrappedString(ENCYCLOPEDIA_LOCATION_BOX_DESC_X, ENCYCLOPEDIA_LOCATION_BOX_DESC_Y + 13, ENCYCLOPEDIA_LOCATION_BOX_TEXT_WIDTH, 6, ENCYCLOPEDIA_LOCATION_BOX_FONT, ENCYCLOPEDIA_LOCATION_BOX_COLOR, gEncyclopediaDataTemp[LocationID].sDesc20, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+	*/
 	}
 	//Reset
 	if ( ResetVal == TRUE )
@@ -1628,7 +1674,8 @@ void RenderEncyclopediaLocation( BOOLEAN bHidden )
 
 void SelectEncyclopediaLocationPageRegionCallBack(GUI_BUTTON * btn, INT32 reason )
 { 
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	UINT8	ubRetValue = (UINT8)MSYS_GetBtnUserData( btn, 0 );
 	
 	if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
@@ -1680,7 +1727,8 @@ void SelectEncyclopediaLocationPageRegionCallBack(GUI_BUTTON * btn, INT32 reason
 
 void SelectEncyclopediaLocationRegionCallBack(GUI_BUTTON * btn, INT32 reason )
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	UINT8	ubRetValue = (UINT8)MSYS_GetBtnUserData( btn, 0 );
 	
 	if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
@@ -2638,7 +2686,8 @@ void SelectInventoryFiltrButtonsRegionCallBack(GUI_BUTTON * btn, INT32 reason )
 
 void SelectSoundButtonsRegionCallBack(GUI_BUTTON * btn, INT32 reason )
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+//#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	UINT8	ubRetValue = (UINT8)MSYS_GetBtnUserData( btn, 0 );
 	CHAR8 str[MAX_ENCYCLOPEDIA_CHARS];
 	
@@ -2747,11 +2796,13 @@ void SelectSoundButtonsRegionCallBack(GUI_BUTTON * btn, INT32 reason )
 
 BOOLEAN SaveEncyclopediaToSaveGameFile( HWFILE hFile )
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	UINT32	uiNumBytesWritten;
 	UINT32 i;
+#endif
+	
 
-
+#ifdef ENABLE_BRIEFINGROOM 
 	//Briefing room
 	for(i=0; i<NUM_SECTOR; i++)
 	{
@@ -2777,7 +2828,9 @@ BOOLEAN SaveEncyclopediaToSaveGameFile( HWFILE hFile )
 	{
 		return( FALSE );
 	}
-
+#endif	
+	
+#ifdef ENABLE_ENCYCLOPEDIA
 	//Quests
 	for(i=0; i<MAX_QUESTS; i++)
 	{
@@ -2844,9 +2897,12 @@ BOOLEAN SaveEncyclopediaToSaveGameFile( HWFILE hFile )
 
 BOOLEAN LoadEncyclopediaFromLoadGameFile( HWFILE hFile )
 {
-#ifdef ENABLE_ENCYCLOPEDIA
+#if (defined ENABLE_ENCYCLOPEDIA || defined ENABLE_BRIEFINGROOM) 
 	UINT32	uiNumBytesRead;
 	UINT32 i;
+#endif
+	
+#ifdef ENABLE_BRIEFINGROOM
 
 	//Briefing room
 	FileRead( hFile, &saveBriefingRoomData, sizeof( saveBriefingRoomData), &uiNumBytesRead );
@@ -2873,7 +2929,9 @@ BOOLEAN LoadEncyclopediaFromLoadGameFile( HWFILE hFile )
 		gBriefingRoomSpecialMissionData[ i ].Hidden = saveBriefingRoomSpecialMissionData[i].Hidden;
 		gBriefingRoomSpecialMissionData[ i ].CheckMission = saveBriefingRoomSpecialMissionData[i].CheckMission;
 	}
+#endif
 	
+#ifdef ENABLE_ENCYCLOPEDIA	
 	//Quests
 	FileRead( hFile, &saveEncyclopediaQuestsData, sizeof( saveEncyclopediaQuestsData), &uiNumBytesRead );
 	if( uiNumBytesRead != sizeof( saveEncyclopediaQuestsData ) )
@@ -3129,4 +3187,4 @@ void BtnEncyclopediaTogglesCallback( GUI_BUTTON *btn, INT32 reason )
 		}
 	}
 }
-*/
+*/
diff --git a/Laptop/XML_EncyclopediaLocation.cpp b/Laptop/XML_EncyclopediaLocation.cpp
index 3a476df8..03c87816 100644
--- a/Laptop/XML_EncyclopediaLocation.cpp
+++ b/Laptop/XML_EncyclopediaLocation.cpp
@@ -311,7 +311,7 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc2, pData->curEncyclopediaData.sDesc2);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc3, pData->curEncyclopediaData.sDesc3);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc4, pData->curEncyclopediaData.sDesc4);
-						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc5, pData->curEncyclopediaData.sDesc5);
+					/*	wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc5, pData->curEncyclopediaData.sDesc5);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc6, pData->curEncyclopediaData.sDesc6);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc7, pData->curEncyclopediaData.sDesc7);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc8, pData->curEncyclopediaData.sDesc8);
@@ -327,7 +327,7 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc18, pData->curEncyclopediaData.sDesc18);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc19, pData->curEncyclopediaData.sDesc19);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc20, pData->curEncyclopediaData.sDesc20);
-						
+					*/	
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].Name, pData->curEncyclopediaData.Name);	
 					}
 					else if ( pEncy[pData->curEncyclopediaData.uiIndex].enableDesc == TRUE && pEncy[pData->curEncyclopediaData.uiIndex].SpecialQuestImage == FALSE )
@@ -336,7 +336,7 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc2, pData->curEncyclopediaData.sDesc2);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc3, pData->curEncyclopediaData.sDesc3);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc4, pData->curEncyclopediaData.sDesc4);
-						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc5, pData->curEncyclopediaData.sDesc5);
+					/*	wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc5, pData->curEncyclopediaData.sDesc5);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc6, pData->curEncyclopediaData.sDesc6);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc7, pData->curEncyclopediaData.sDesc7);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc8, pData->curEncyclopediaData.sDesc8);
@@ -352,7 +352,7 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc18, pData->curEncyclopediaData.sDesc18);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc19, pData->curEncyclopediaData.sDesc19);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc20, pData->curEncyclopediaData.sDesc20);
-						
+					*/	
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].Name, pData->curEncyclopediaData.Name);	
 					}
 					else if ( pEncy[pData->curEncyclopediaData.uiIndex].enableDesc == FALSE && FileType == 1 )
@@ -509,7 +509,7 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc2, pData->curEncyclopediaData.sDesc2);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc3, pData->curEncyclopediaData.sDesc3);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc4, pData->curEncyclopediaData.sDesc4);
-						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc5, pData->curEncyclopediaData.sDesc5);
+					/*	wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc5, pData->curEncyclopediaData.sDesc5);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc6, pData->curEncyclopediaData.sDesc6);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc7, pData->curEncyclopediaData.sDesc7);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc8, pData->curEncyclopediaData.sDesc8);
@@ -525,7 +525,7 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc18, pData->curEncyclopediaData.sDesc18);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc19, pData->curEncyclopediaData.sDesc19);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc20, pData->curEncyclopediaData.sDesc20);
-						
+					*/	
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].Name, pData->curEncyclopediaData.Name);	
 					}
 					else if ( pEncy[pData->curEncyclopediaData.uiIndex].enableDesc == TRUE && pEncy[pData->curEncyclopediaData.uiIndex].SpecialQuestImage == FALSE )
@@ -534,7 +534,7 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc2, pData->curEncyclopediaData.sDesc2);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc3, pData->curEncyclopediaData.sDesc3);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc4, pData->curEncyclopediaData.sDesc4);
-						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc5, pData->curEncyclopediaData.sDesc5);
+					/*	wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc5, pData->curEncyclopediaData.sDesc5);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc6, pData->curEncyclopediaData.sDesc6);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc7, pData->curEncyclopediaData.sDesc7);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc8, pData->curEncyclopediaData.sDesc8);
@@ -550,7 +550,7 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc18, pData->curEncyclopediaData.sDesc18);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc19, pData->curEncyclopediaData.sDesc19);
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].sDesc20, pData->curEncyclopediaData.sDesc20);
-						
+					*/	
 						wcscpy(pEncy[pData->curEncyclopediaData.uiIndex].Name, pData->curEncyclopediaData.Name);
 					}	
 					else if ( pEncy[pData->curEncyclopediaData.uiIndex].enableDesc == FALSE && FileType == 1 )
@@ -700,113 +700,113 @@ encyclopediaLocationEndElementHandle(void *userData, const XML_Char *name)
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc5, sizeof(pData->curEncyclopediaData.sDesc5)/sizeof(pData->curEncyclopediaData.sDesc5[0]) );
-			pData->curEncyclopediaData.sDesc5[sizeof(pData->curEncyclopediaData.sDesc5)/sizeof(pData->curEncyclopediaData.sDesc5[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc5, sizeof(pData->curEncyclopediaData.sDesc5)/sizeof(pData->curEncyclopediaData.sDesc5[0]) );
+		//	pData->curEncyclopediaData.sDesc5[sizeof(pData->curEncyclopediaData.sDesc5)/sizeof(pData->curEncyclopediaData.sDesc5[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc6") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc6, sizeof(pData->curEncyclopediaData.sDesc6)/sizeof(pData->curEncyclopediaData.sDesc6[0]) );
-			pData->curEncyclopediaData.sDesc6[sizeof(pData->curEncyclopediaData.sDesc6)/sizeof(pData->curEncyclopediaData.sDesc6[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc6, sizeof(pData->curEncyclopediaData.sDesc6)/sizeof(pData->curEncyclopediaData.sDesc6[0]) );
+		//	pData->curEncyclopediaData.sDesc6[sizeof(pData->curEncyclopediaData.sDesc6)/sizeof(pData->curEncyclopediaData.sDesc6[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc7") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc7, sizeof(pData->curEncyclopediaData.sDesc7)/sizeof(pData->curEncyclopediaData.sDesc7[0]) );
-			pData->curEncyclopediaData.sDesc7[sizeof(pData->curEncyclopediaData.sDesc7)/sizeof(pData->curEncyclopediaData.sDesc7[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc7, sizeof(pData->curEncyclopediaData.sDesc7)/sizeof(pData->curEncyclopediaData.sDesc7[0]) );
+		//	pData->curEncyclopediaData.sDesc7[sizeof(pData->curEncyclopediaData.sDesc7)/sizeof(pData->curEncyclopediaData.sDesc7[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc8") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc8, sizeof(pData->curEncyclopediaData.sDesc8)/sizeof(pData->curEncyclopediaData.sDesc8[0]) );
-			pData->curEncyclopediaData.sDesc8[sizeof(pData->curEncyclopediaData.sDesc8)/sizeof(pData->curEncyclopediaData.sDesc8[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc8, sizeof(pData->curEncyclopediaData.sDesc8)/sizeof(pData->curEncyclopediaData.sDesc8[0]) );
+		//	pData->curEncyclopediaData.sDesc8[sizeof(pData->curEncyclopediaData.sDesc8)/sizeof(pData->curEncyclopediaData.sDesc8[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc9") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc9, sizeof(pData->curEncyclopediaData.sDesc9)/sizeof(pData->curEncyclopediaData.sDesc9[0]) );
-			pData->curEncyclopediaData.sDesc9[sizeof(pData->curEncyclopediaData.sDesc9)/sizeof(pData->curEncyclopediaData.sDesc9[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc9, sizeof(pData->curEncyclopediaData.sDesc9)/sizeof(pData->curEncyclopediaData.sDesc9[0]) );
+		//	pData->curEncyclopediaData.sDesc9[sizeof(pData->curEncyclopediaData.sDesc9)/sizeof(pData->curEncyclopediaData.sDesc9[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc10") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc10, sizeof(pData->curEncyclopediaData.sDesc10)/sizeof(pData->curEncyclopediaData.sDesc10[0]) );
-			pData->curEncyclopediaData.sDesc10[sizeof(pData->curEncyclopediaData.sDesc10)/sizeof(pData->curEncyclopediaData.sDesc10[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc10, sizeof(pData->curEncyclopediaData.sDesc10)/sizeof(pData->curEncyclopediaData.sDesc10[0]) );
+		//	pData->curEncyclopediaData.sDesc10[sizeof(pData->curEncyclopediaData.sDesc10)/sizeof(pData->curEncyclopediaData.sDesc10[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc11") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc11, sizeof(pData->curEncyclopediaData.sDesc11)/sizeof(pData->curEncyclopediaData.sDesc11[0]) );
-			pData->curEncyclopediaData.sDesc11[sizeof(pData->curEncyclopediaData.sDesc11)/sizeof(pData->curEncyclopediaData.sDesc11[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc11, sizeof(pData->curEncyclopediaData.sDesc11)/sizeof(pData->curEncyclopediaData.sDesc11[0]) );
+		//	pData->curEncyclopediaData.sDesc11[sizeof(pData->curEncyclopediaData.sDesc11)/sizeof(pData->curEncyclopediaData.sDesc11[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc12") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc12, sizeof(pData->curEncyclopediaData.sDesc12)/sizeof(pData->curEncyclopediaData.sDesc12[0]) );
-			pData->curEncyclopediaData.sDesc12[sizeof(pData->curEncyclopediaData.sDesc12)/sizeof(pData->curEncyclopediaData.sDesc12[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc12, sizeof(pData->curEncyclopediaData.sDesc12)/sizeof(pData->curEncyclopediaData.sDesc12[0]) );
+		//	pData->curEncyclopediaData.sDesc12[sizeof(pData->curEncyclopediaData.sDesc12)/sizeof(pData->curEncyclopediaData.sDesc12[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc13") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc13, sizeof(pData->curEncyclopediaData.sDesc13)/sizeof(pData->curEncyclopediaData.sDesc13[0]) );
-			pData->curEncyclopediaData.sDesc13[sizeof(pData->curEncyclopediaData.sDesc13)/sizeof(pData->curEncyclopediaData.sDesc13[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc13, sizeof(pData->curEncyclopediaData.sDesc13)/sizeof(pData->curEncyclopediaData.sDesc13[0]) );
+		//	pData->curEncyclopediaData.sDesc13[sizeof(pData->curEncyclopediaData.sDesc13)/sizeof(pData->curEncyclopediaData.sDesc13[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc14") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc14, sizeof(pData->curEncyclopediaData.sDesc14)/sizeof(pData->curEncyclopediaData.sDesc14[0]) );
-			pData->curEncyclopediaData.sDesc14[sizeof(pData->curEncyclopediaData.sDesc14)/sizeof(pData->curEncyclopediaData.sDesc14[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc14, sizeof(pData->curEncyclopediaData.sDesc14)/sizeof(pData->curEncyclopediaData.sDesc14[0]) );
+		//	pData->curEncyclopediaData.sDesc14[sizeof(pData->curEncyclopediaData.sDesc14)/sizeof(pData->curEncyclopediaData.sDesc14[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc15") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc15, sizeof(pData->curEncyclopediaData.sDesc15)/sizeof(pData->curEncyclopediaData.sDesc15[0]) );
-			pData->curEncyclopediaData.sDesc15[sizeof(pData->curEncyclopediaData.sDesc15)/sizeof(pData->curEncyclopediaData.sDesc15[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc15, sizeof(pData->curEncyclopediaData.sDesc15)/sizeof(pData->curEncyclopediaData.sDesc15[0]) );
+		//	pData->curEncyclopediaData.sDesc15[sizeof(pData->curEncyclopediaData.sDesc15)/sizeof(pData->curEncyclopediaData.sDesc15[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc16") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc16, sizeof(pData->curEncyclopediaData.sDesc16)/sizeof(pData->curEncyclopediaData.sDesc16[0]) );
-			pData->curEncyclopediaData.sDesc16[sizeof(pData->curEncyclopediaData.sDesc16)/sizeof(pData->curEncyclopediaData.sDesc16[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc16, sizeof(pData->curEncyclopediaData.sDesc16)/sizeof(pData->curEncyclopediaData.sDesc16[0]) );
+		//	pData->curEncyclopediaData.sDesc16[sizeof(pData->curEncyclopediaData.sDesc16)/sizeof(pData->curEncyclopediaData.sDesc16[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc17") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc17, sizeof(pData->curEncyclopediaData.sDesc17)/sizeof(pData->curEncyclopediaData.sDesc17[0]) );
-			pData->curEncyclopediaData.sDesc17[sizeof(pData->curEncyclopediaData.sDesc17)/sizeof(pData->curEncyclopediaData.sDesc17[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc17, sizeof(pData->curEncyclopediaData.sDesc17)/sizeof(pData->curEncyclopediaData.sDesc17[0]) );
+		//	pData->curEncyclopediaData.sDesc17[sizeof(pData->curEncyclopediaData.sDesc17)/sizeof(pData->curEncyclopediaData.sDesc17[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc18") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc18, sizeof(pData->curEncyclopediaData.sDesc18)/sizeof(pData->curEncyclopediaData.sDesc18[0]) );
-			pData->curEncyclopediaData.sDesc18[sizeof(pData->curEncyclopediaData.sDesc18)/sizeof(pData->curEncyclopediaData.sDesc18[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc18, sizeof(pData->curEncyclopediaData.sDesc18)/sizeof(pData->curEncyclopediaData.sDesc18[0]) );
+		//	pData->curEncyclopediaData.sDesc18[sizeof(pData->curEncyclopediaData.sDesc18)/sizeof(pData->curEncyclopediaData.sDesc18[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc19") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc19, sizeof(pData->curEncyclopediaData.sDesc19)/sizeof(pData->curEncyclopediaData.sDesc19[0]) );
-			pData->curEncyclopediaData.sDesc19[sizeof(pData->curEncyclopediaData.sDesc19)/sizeof(pData->curEncyclopediaData.sDesc19[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc19, sizeof(pData->curEncyclopediaData.sDesc19)/sizeof(pData->curEncyclopediaData.sDesc19[0]) );
+		//	pData->curEncyclopediaData.sDesc19[sizeof(pData->curEncyclopediaData.sDesc19)/sizeof(pData->curEncyclopediaData.sDesc19[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "PageDesc20") == 0 )
 		{
 			pData->curElement = ENCYCLOPEDIA_ELEMENT;
 
-			MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc20, sizeof(pData->curEncyclopediaData.sDesc20)/sizeof(pData->curEncyclopediaData.sDesc20[0]) );
-			pData->curEncyclopediaData.sDesc20[sizeof(pData->curEncyclopediaData.sDesc20)/sizeof(pData->curEncyclopediaData.sDesc20[0]) - 1] = '\0';
+		//	MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curEncyclopediaData.sDesc20, sizeof(pData->curEncyclopediaData.sDesc20)/sizeof(pData->curEncyclopediaData.sDesc20[0]) );
+		//	pData->curEncyclopediaData.sDesc20[sizeof(pData->curEncyclopediaData.sDesc20)/sizeof(pData->curEncyclopediaData.sDesc20[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "MaxImages") == 0)
 		{
diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp
index d347e14b..a784ce51 100644
--- a/Utils/_ChineseText.cpp
+++ b/Utils/_ChineseText.cpp
@@ -144,7 +144,7 @@ STR16 pMenuStrings[] =
 	L"菜单15",
 	
 	//Briefing Room
-	L"退出",
+	L"Enter",		// TODO.Translate
 };
 
 STR16	pOtherButtonsText[] =
@@ -175,6 +175,7 @@ STR16	pSectorPageText[] =
 	L"类型: ",
 	L"空白数据",
 	L"Missing of defined missions. Add missions to the file TableData\\BriefingRoom\\BriefingRoom.xml. First mission has to be visible. Put value Hidden = 0.",
+	L"Briefing Room. Please click the 'Enter' button.",		// TODO.Translate
 };
 
 STR16	pEncyclopediaTypeText[] = 
diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index 6283b4cc..ae7f9a4a 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -145,7 +145,7 @@ STR16 pMenuStrings[] =
 	L"Menu 15", // 15
 	
 	//Briefing Room
-	L"Exit",
+	L"Enter",
 };
 
 STR16	pOtherButtonsText[] =
@@ -176,6 +176,7 @@ STR16	pSectorPageText[] =
 	L"Type: ",
 	L"Empty data",
 	L"Missing of defined missions. Add missions to the file TableData\\BriefingRoom\\BriefingRoom.xml. First mission has to be visible. Put value Hidden = 0.",
+	L"Briefing Room. Please click the 'Enter' button.",		// TODO.Translate
 };
 
 STR16	pEncyclopediaTypeText[] = 
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 41dd9eee..8717f918 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -144,7 +144,7 @@ STR16 pMenuStrings[] =
 	L"Menu 15", // 15
 	
 	//Briefing Room
-	L"Exit",
+	L"Enter",
 };
 
 STR16	pOtherButtonsText[] =
@@ -175,6 +175,7 @@ STR16	pSectorPageText[] =
 	L"Type: ",
 	L"Empty data",
 	L"Missing of defined missions. Add missions to the file TableData\\BriefingRoom\\BriefingRoom.xml. First mission has to be visible. Put value Hidden = 0.",
+	L"Briefing Room. Please click the 'Enter' button.",
 };
 
 STR16	pEncyclopediaTypeText[] = 
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index 6fac1623..87cae8d0 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -149,7 +149,7 @@ STR16 pMenuStrings[] =
 	L"Menu 15", // 15
 	
 	//Briefing Room
-	L"Exit",
+	L"Enter",		// TODO.Translate
 };
 
 STR16	pOtherButtonsText[] =
@@ -180,6 +180,7 @@ STR16	pSectorPageText[] =
 	L"Type: ",
 	L"Empty data",
 	L"Missing of defined missions. Add missions to the file TableData\\BriefingRoom\\BriefingRoom.xml. First mission has to be visible. Put value Hidden = 0.",
+	L"Briefing Room. Please click the 'Enter' button.",		// TODO.Translate
 };
 
 STR16	pEncyclopediaTypeText[] = 
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index 3b07b76e..94d03358 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -168,7 +168,7 @@ STR16 pMenuStrings[] =
 	L"Menu 15", // 15
 	
 	//Briefing Room
-	L"Beenden",
+	L"Eintreten",	// TODO.Translate
 };
 
 STR16	pOtherButtonsText[] =
@@ -198,7 +198,8 @@ STR16	pSectorPageText[] =
 	L">>",
 	L"Typ: ",
 	L"Keine Daten",
-	L"Es gibt keine Missionen. Fügen Sie Missionen zu der Datei TableData\\BriefingRoom\\BriefingRoom.xml hinzu. Die erste Mission muss SICHTBAR sein. Setzen Sie den Wert Hidden = 0.",	
+	L"Es gibt keine Missionen. Fügen Sie Missionen zu der Datei TableData\\BriefingRoom\\BriefingRoom.xml hinzu. Die erste Mission muss SICHTBAR sein. Setzen Sie den Wert Hidden = 0.",
+	L"Besprechungszimmer. Bitte drücken sie auf 'Eintreten'.",		// TODO.Translate
 };
 
 STR16	pEncyclopediaTypeText[] = 
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 466218c2..404e4794 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -143,7 +143,7 @@ STR16 pMenuStrings[] =
 	L"Menu 15", // 15
 	
 	//Briefing Room
-	L"Exit",
+	L"Enter",		// TODO.Translate
 };
 
 STR16	pOtherButtonsText[] =
@@ -174,6 +174,7 @@ STR16	pSectorPageText[] =
 	L"Type: ",
 	L"Empty data",
 	L"Missing of defined missions. Add missions to the file TableData\\BriefingRoom\\BriefingRoom.xml. First mission has to be visible. Put value Hidden = 0.",
+	L"Briefing Room. Please click the 'Enter' button.",		// TODO.Translate
 };
 
 STR16	pEncyclopediaTypeText[] = 
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index 9b3e8e4e..cf0f859f 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -145,7 +145,7 @@ STR16 pMenuStrings[] =
 	L"Menu 15", // 15
 	
 	//Briefing Room
-	L"Wejœcie",
+	L"Enter",		// TODO.Translate
 };
 
 STR16	pOtherButtonsText[] =
@@ -176,6 +176,7 @@ STR16	pSectorPageText[] =
 	L"Typ: ",
 	L"Brak danych",
 	L"Brak zdefiniowanych misji. Dodaj misje do pliku TableData\\BriefingRoom\\BriefingRoom.xml. Pierwsza misja ma byæ widoczna. Ustaw Hidden = 0",
+	L"Briefing Room. Please click the 'Enter' button.",		// TODO.Translate
 };
 
 STR16	pEncyclopediaTypeText[] = 
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index 1e9870d6..16c15560 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -144,7 +144,7 @@ STR16 pMenuStrings[] =
 	L"Menu 15", // 15
 	
 	//Briefing Room
-	L"Exit",
+	L"Enter",		// TODO.Translate
 };
 
 STR16	pOtherButtonsText[] =
@@ -175,6 +175,7 @@ STR16	pSectorPageText[] =
 	L"Type: ",
 	L"Empty data",
 	L"Missing of defined missions. Add missions to the file TableData\\BriefingRoom\\BriefingRoom.xml. First mission has to be visible. Put value Hidden = 0.",
+	L"Briefing Room. Please click the 'Enter' button.",		// TODO.Translate
 };
 
 STR16	pEncyclopediaTypeText[] = 
diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp
index bd96cf69..6cbad316 100644
--- a/Utils/_TaiwaneseText.cpp
+++ b/Utils/_TaiwaneseText.cpp
@@ -143,7 +143,7 @@ STR16 pMenuStrings[] =
 	L"Menu 15", // 15
 	
 	//Briefing Room
-	L"Exit",
+	L"Enter",		// TODO.Translate
 };
 
 STR16	pOtherButtonsText[] =
@@ -173,6 +173,8 @@ STR16	pSectorPageText[] =
 	L">>",
 	L"Type: ",
 	L"Empty data",
+	L"Missing of defined missions. Add missions to the file TableData\\BriefingRoom\\BriefingRoom.xml. First mission has to be visible. Put value Hidden = 0.",
+	L"Briefing Room. Please click the 'Enter' button.",		// TODO.Translate
 };
 
 STR16	pEncyclopediaTypeText[] = 
@@ -259,7 +261,6 @@ STR16	pEncyclopediaShortInventoryText[] =
 	L"Ammo",
 	L"LBE Gear",
 	L"Misc",
-	L"Missing of defined missions. Add missions to the file TableData\\BriefingRoom\\BriefingRoom.xml. First mission has to be visible. Put value Hidden = 0.",
 };
 
 STR16			BoxFilter[] =
diff --git a/builddefines.h b/builddefines.h
index 4ae9257e..d09e6588 100644
--- a/builddefines.h
+++ b/builddefines.h
@@ -3,6 +3,11 @@
 
 #include "Language Defines.h"
 
+//----- Encyclopedia and Briefing room - by Jazz -----
+//#define ENABLE_ENCYCLOPEDIA		// WANNE: Be aware, encyclopedia uses a hugh amount of memory and the exe takes forever to start. There seems to be some memory leaks
+//#define ENABLE_BRIEFINGROOM		// WANNE: Briefing room seems to work better. Waiting for Jazz to create a mini mod to show this feature
+//----- End encyclopedia and Briefing room - by Jazz -----
+
 // -----------------------------
 // *****************************
 // WANNE: Enable those 2 defines, if you want to build UB-Version!!