diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 8c57f70..8281aba 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -44,6 +44,8 @@ encoding//Debug/driverlib/lib/gcc/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/gcc/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/gcc/m0p/mspm0gx51x/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/gcc/m0p/mspm0gx51x/subdir_vars.mk=UTF-8
+encoding//Debug/driverlib/lib/gcc/m0p/mspm0l111x/subdir_rules.mk=UTF-8
+encoding//Debug/driverlib/lib/gcc/m0p/mspm0l111x/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/gcc/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/gcc/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/gcc/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8
@@ -54,6 +56,8 @@ encoding//Debug/driverlib/lib/iar/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/iar/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/iar/m0p/mspm0gx51x/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/iar/m0p/mspm0gx51x/subdir_vars.mk=UTF-8
+encoding//Debug/driverlib/lib/iar/m0p/mspm0l111x/subdir_rules.mk=UTF-8
+encoding//Debug/driverlib/lib/iar/m0p/mspm0l111x/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/iar/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/iar/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/iar/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8
@@ -64,6 +68,8 @@ encoding//Debug/driverlib/lib/keil/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/keil/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/keil/m0p/mspm0gx51x/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/keil/m0p/mspm0gx51x/subdir_vars.mk=UTF-8
+encoding//Debug/driverlib/lib/keil/m0p/mspm0l111x/subdir_rules.mk=UTF-8
+encoding//Debug/driverlib/lib/keil/m0p/mspm0l111x/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/keil/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/keil/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/keil/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8
@@ -74,6 +80,8 @@ encoding//Debug/driverlib/lib/ticlang/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/ticlang/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/ticlang/m0p/mspm0gx51x/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/ticlang/m0p/mspm0gx51x/subdir_vars.mk=UTF-8
+encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l111x/subdir_rules.mk=UTF-8
+encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l111x/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8
 encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8
 encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8
@@ -88,12 +96,22 @@ encoding//Debug/ivec_APP/ivec_cmplx_gptimer/src/subdir_rules.mk=UTF-8
 encoding//Debug/ivec_APP/ivec_cmplx_gptimer/src/subdir_vars.mk=UTF-8
 encoding//Debug/ivec_APP/src/subdir_rules.mk=UTF-8
 encoding//Debug/ivec_APP/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_BSW/ivec_bsw_common/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_BSW/ivec_bsw_common/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_BSW/ivec_bsw_nfc/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_BSW/ivec_bsw_nfc/src/subdir_vars.mk=UTF-8
 encoding//Debug/ivec_ECU/ivec_ecu_can/src/subdir_rules.mk=UTF-8
 encoding//Debug/ivec_ECU/ivec_ecu_can/src/subdir_vars.mk=UTF-8
 encoding//Debug/ivec_ECU/ivec_ecu_common/src/subdir_rules.mk=UTF-8
 encoding//Debug/ivec_ECU/ivec_ecu_common/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_ECU/ivec_ecu_nfc/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_ECU/ivec_ecu_nfc/src/subdir_vars.mk=UTF-8
 encoding//Debug/ivec_ECU/ivec_ecu_uart/src/subdir_rules.mk=UTF-8
 encoding//Debug/ivec_ECU/ivec_ecu_uart/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_ESDK/ivec_cmplx_gptimer/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_ESDK/ivec_cmplx_gptimer/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_ESDK/ivec_esdk_nfc_pn532/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_ESDK/ivec_esdk_nfc_pn532/src/subdir_vars.mk=UTF-8
 encoding//Debug/ivec_RTE/src/subdir_rules.mk=UTF-8
 encoding//Debug/ivec_RTE/src/subdir_vars.mk=UTF-8
 encoding//Debug/makefile=UTF-8
diff --git a/Generated Codes/ti_msp_dl_config.c b/Generated Codes/ti_msp_dl_config.c
index 30f3e0e..fb4ce78 100644
--- a/Generated Codes/ti_msp_dl_config.c	
+++ b/Generated Codes/ti_msp_dl_config.c	
@@ -145,7 +145,7 @@ SYSCONFIG_WEAK void SYSCFG_DL_GPIO_init(void)
     DL_GPIO_initPeripheralAnalogFunction(GPIO_HFXIN_IOMUX);
     DL_GPIO_initPeripheralAnalogFunction(GPIO_HFXOUT_IOMUX);
 
-    DL_GPIO_initPeripheralInputFunction(GPIO_CAPTURE_0_C0_IOMUX,GPIO_CAPTURE_0_C0_IOMUX_FUNC);
+    DL_GPIO_initPeripheralInputFunction(GPIO_CAPTURE_0_C0_IOMUX, GPIO_CAPTURE_0_C0_IOMUX_FUNC);
 
     DL_GPIO_initPeripheralOutputFunction(
         GPIO_UART_0_IOMUX_TX, GPIO_UART_0_IOMUX_TX_FUNC);
diff --git a/ivec_RTE/src/ivec_rte.c b/ivec_RTE/src/ivec_rte.c
index 8a41b2e..7ea29ab 100644
--- a/ivec_RTE/src/ivec_rte.c
+++ b/ivec_RTE/src/ivec_rte.c
@@ -26,7 +26,7 @@ IVEC_EcuCANHandle_s g_xCanHandle;
 #define rteCONFIG_MOTHER_BOARD_u8                 3
 
 // UART Configuration
-#define rteUART_PIN_SELECTION_u8           rteCONFIG_BASIL_u8
+#define rteUART_PIN_SELECTION_u8           rteCONFIG_MOTHER_BOARD_u8
 
 uint8_t g_pu8UartBuffer[ecuUART_MAX_PACKET_LENGTH_u8] = {0};
 volatile uint32_t g_u32CanId = 0x1FFFFFFF;
@@ -216,12 +216,15 @@ void vRTE_MatlabRun(void)
 
 void vRTE_AppInit(void)
 {
-        #if rteUART_PIN_SELECTION_u8 == 1
-            vRTE_MatlabInit();
-        #endif
+#if rteUART_PIN_SELECTION_u8 == 1
+    vRTE_MatlabInit();
+#endif
 
-        vRTE_InitUartCanEcho();
-        vRTE_NfcInit();
+    vRTE_InitUartCanEcho();
+
+#if rteUART_PIN_SELECTION_u8 == 3
+    vRTE_NfcInit();
+#endif
 }
 /**
  * @brief Callback function for timer interrupt.
@@ -239,9 +242,17 @@ void vRTE_InitUartCanEcho(void)
 {
     g_xUartHandle.u8Qbuffer = g_prvU8CanUartDataBuffer;
     g_xUartHandle.u16QbufSize = eteCAN_UART_BUFFER_MAX_SIZE_u32;
+
+#if (rteUART_PIN_SELECTION_u8 == 1)
+    g_xUartHandle.eUartPortNumber = IVEC_ECU_UART_PORT3;
+    g_xUartHandle.u32BaudRate = IVEC_ECU_UART_BAUD_115200;
+#elif (rteUART_PIN_SELECTION_u8 == 2)
     g_xUartHandle.eUartPortNumber = IVEC_ECU_UART_PORT2;
     g_xUartHandle.u32BaudRate = IVEC_ECU_UART_BAUD_115200;
-
+#elif (rteUART_PIN_SELECTION_u8 == 3)
+    g_xUartHandle.eUartPortNumber = IVEC_ECU_UART_PORT2;
+    g_xUartHandle.u32BaudRate = IVEC_ECU_UART_BAUD_115200;
+#endif
 
     xECU_UartInit(&g_xUartHandle);
 
@@ -370,7 +381,9 @@ void vRTE_AppRun(void)
 {
     vRTE_ProcessUartData();
     vRTE_ProcessCanData();
+#if rteUART_PIN_SELECTION_u8 == 3
     vRTE_UartNfcProcess();
+#endif
 }
 /**
  * @brief Callback function for timer interrupt.