diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc
index fb493973e22..491258eb48c 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc
@@ -18,7 +18,16 @@
   DEFINE      PEI_ARCH                  = IA32
   DEFINE      DXE_ARCH                  = X64
   DEFINE      TOP_MEMORY_ADDRESS        = 0x0
-
+  #v added 3/16/21
+  DEFINE NETWORK_ENABLE                        = TRUE
+  DEFINE NETWORK_IP4_ENABLE                    = TRUE
+  DEFINE NETWORK_ISCSI_ENABLE                  = FALSE
+  DEFINE NETWORK_VLAN_ENABLE                   = TRUE
+  DEFINE NETWORK_IPSEC_ENABLE                  = TRUE
+  DEFINE NETWORK_TLS_ENABLE                    = TRUE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE              = TRUE
+  DEFINE NETWORK_HTTP_ENABLE				   = TRUE
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS        = TRUE
   #
   # Default value for OpenBoardPkg.fdf use
   #
@@ -155,11 +164,12 @@
   SiliconPolicyUpdateLib|$(PROJECT)/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
   TimerLib|$(PLATFORM_BOARD_PACKAGE)/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
 
+# commented this section out
 [LibraryClasses.common.PEIM]
   #######################################
   # Silicon Initialization Package
   #######################################
-  SiliconInitLib|$(PLATFORM_SI_PACKAGE)/Library/PeiSiliconInitLib/PeiSiliconInitLib.inf
+ SiliconInitLib|$(PLATFORM_SI_PACKAGE)/Library/PeiSiliconInitLib/PeiSiliconInitLib.inf
 
   #######################################
   # Platform Package
@@ -205,7 +215,19 @@
   # Edk2 Packages
   #######################################
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-
+#v added 3/16/21
+#changed MdeModulePkg to NetworkPkg
+#  DpcLib|NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
+#  NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
+#  IpIoLib|NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+#  UdpIoLib|NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+#  TcpIoLib|NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
+#  HttpLib|NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
+#  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+#  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+#  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+#  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
+#^ added 3/16/21
   #######################################
   # Platform Package
   #######################################
@@ -350,6 +372,14 @@
   MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
   UefiCpuPkg/CpuDxe/CpuDxe.inf
 
+  #added 5/17/21 for bds menu
+  MdeModulePkg/Application/UiApp/UiApp.inf {
+    <LibraryClasses>
+      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
+      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
+      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
+  }
+  
   #
   # eMMC/SD Card
   #
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf
index 0d991149618..5f9d537fd97 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf
@@ -101,7 +101,8 @@ DATA = {
   #Blockmap[1]: End
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   ## This is the VARIABLE_STORE_HEADER
-!if gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE
+  ## disable secureboot for now 4/13/2021
+!if gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable == FALSE
   #  Signature: gEfiAuthenticatedVariableGuid = { 0xaaf32c78, 0x947b, 0x439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}
   0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,
   0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,
@@ -333,6 +334,9 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 FvNameGuid         = A881D567-6CB0-4eee-8435-2E72D33E45B5
 
+#added 5/17/21 for bds menu
+#INF RuleOverride = UI MdeModulePkg/Application/UiApp/UiApp.inf
+
 !include $(PLATFORM_PACKAGE)/Include/Fdf/CoreUefiBootInclude.fdf
 INF  $(PLATFORM_SI_PACKAGE)/Pch/PchInit/Dxe/PchInitDxeCnl.inf
 
@@ -660,6 +664,14 @@ FvNameGuid         = BE3DF86F-E464-44A3-83F7-0D27E6B88C27
 
 !include AdvancedFeaturePkg/Include/PostMemory.fdf
 
+#v added 3/29/21
+FILE DRIVER = 4e7bf25f-fc50-4589-9efd-00a96e6ccf63 {
+      SECTION PE32 = edk2-non-osi\Drivers\Intel\UndiDriver\E9406X3.EFI
+      SECTION UI = "E7006X3"
+	}
+#^ added 3/29/21
+
+
 !if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE
 INF  $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
 INF  $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf
@@ -706,4 +718,10 @@ FILE FV_IMAGE = 5248467B-B87B-4E74-AC02-398AF4BCB712 {
 
 !include $(PLATFORM_PACKAGE)/Include/Fdf/RuleInclude.fdf
 
-
+# added 5/17/21 for bds menu
+[Rule.Common.UEFI_APPLICATION.UI]
+  FILE APPLICATION = $(NAMED_GUID) {
+    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
+    UI        STRING="Enter Setup"
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+  }
\ No newline at end of file
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc
index 84d4ec13316..893a748c22f 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkgPcd.dsc
@@ -26,7 +26,7 @@
   # Stage 5 - boot to OS with security boot enabled
   # Stage 6 - boot with advanced features enabled
   #
-  gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4
+  gMinPlatformPkgTokenSpaceGuid.PcdBootStage|6
 
   #
   # 0: FSP Wrapper is running in Dispatch mode.
@@ -146,10 +146,10 @@
 !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4
   gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly|FALSE
 !endif
-
+# changed pcduefisecurebootenable to false 4/13/21
 !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 5
-  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|TRUE
-  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|TRUE
+  gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable|FALSE
+  gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable|FALSE
 !endif
 
 !if $(TARGET) == DEBUG
@@ -165,10 +165,21 @@
   gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport|TRUE
   gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable|FALSE
 
+  #added 4/1/21
+  ######################################
+  # Board Configuration
+  ######################################
+  !if gMinPlatformPkgTokenSpaceGuid.PcdBootStage >= 4
+	 gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable|TRUE
+	# Capsule Update
+	# SMBIOS 
+  !endif
+
 [PcdsFixedAtBuild.common]
   ######################################
   # Edk2 Configuration
   ######################################
+  
 !if $(TARGET) == RELEASE
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
@@ -179,7 +190,7 @@
 !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
   gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
 !endif
-
+  
   gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0
@@ -399,7 +410,7 @@
   gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt|0x1
   gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq|0x1
 
-  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDciEnable|FALSE
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDciEnable|TRUE
 
 [PcdsDynamicHii.X64.DEFAULT]
   ######################################