diff --git a/CMakeLists.txt b/CMakeLists.txt
index b54130b30a..9061f2f71c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -300,11 +300,7 @@ add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)
 
 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
-add_library(ITTI
-  ${OCP_ITTI}/intertask_interface.cpp
-  ${OPENAIR_DIR}/common/utils/backtrace.c
-  )
-
+add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
 target_link_libraries(ITTI PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
 # asn1c skeletons have hardcoded this flag to make customized debug logs
@@ -487,6 +483,7 @@ add_library(CONFIG_LIB
   ${CONFIG_ROOTDIR}/config_userapi.c
   ${CONFIG_ROOTDIR}/config_cmdline.c
 )
+target_link_libraries(CONFIG_LIB PRIVATE dl UTIL)
 add_library(params_libconfig MODULE ${CONFIG_ROOTDIR}/libconfig/config_libconfig.c)
 target_link_libraries(params_libconfig config)
 # shared library loader
@@ -783,7 +780,6 @@ add_library(UTIL
   ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
-  ${OPENAIR_DIR}/common/utils/backtrace.c
   ${OPENAIR_DIR}/common/utils/time_meas.c
   ${OPENAIR_DIR}/common/utils/time_stat.c
 )
@@ -1005,7 +1001,7 @@ add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)
 # Base CUDA setting
 ##############################################
 
-add_boolean_option(BUILD_CUDA False "Build support for CUDA" OFF)
+add_boolean_option(ENABLE_LDPC_CUDA OFF "Build support for CUDA" OFF)
 if (ENABLE_LDPC_CUDA)
   find_package(CUDA REQUIRED)
   SET(CUDA_NVCC_FLAG "${CUDA_NVCC_FLAGS};-arch=sm_60;")
@@ -2040,6 +2036,19 @@ add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
 target_link_libraries(SIMU PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
+# Qt-based scope
+add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
+if (ENABLE_NRQTSCOPE)
+  find_package(Qt5 REQUIRED COMPONENTS Widgets Charts)
+  message ("Qt5 Widgets and Charts found for nrqtscope")
+  set(QTSCOPE_SOURCE_NR ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.cpp)
+  # Creates rules for calling the Meta-Object Compiler (moc) on the given source files
+  qt5_wrap_cpp(QTSCOPE_SOURCE_NR ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.h)
+  add_library(nrqtscope MODULE ${QTSCOPE_SOURCE_NR})
+  target_link_libraries(nrqtscope PRIVATE Qt5::Widgets Qt5::Charts)
+  target_link_libraries(nrqtscope PRIVATE asn1_nr_rrc asn1_lte_rrc)
+endif()
+
 add_library(SIMU_ETH
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
 ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
@@ -2116,7 +2125,6 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
 # add executables for operation
 #################################
 add_library(minimal_lib
-  ${OPENAIR_DIR}/common/utils/backtrace.c
   ${OPENAIR_DIR}/common/utils/LOG/log.c
   ${OPENAIR_DIR}/common/utils/minimal_stub.c
   ${T_SOURCE}
@@ -2175,49 +2183,15 @@ target_link_libraries(lte-softmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
   PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${RAL_LIB} ${NAS_UE_LIB} ITTI SIMU
+  ${NAS_UE_LIB} ITTI SIMU
   -Wl,--end-group z dl)
 
 target_link_libraries(lte-softmodem PRIVATE ${LIBXML2_LIBRARIES})
-target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${CMAKE_DL_LIBS})
-target_link_libraries(lte-softmodem PRIVATE ${LIB_LMS_LIBRARIES})
+target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
 
-add_executable(ocp-enb
-  ${OPENAIR_DIR}/executables/main-ocp.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR_DIR}/executables/main-fs6.c
-  ${OPENAIR_DIR}/executables/transport_split.c
-  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
-  ${OPENAIR_DIR}/executables/create_tasks.c
-  ${OPENAIR_DIR}/executables/create_tasks_mbms.c
-  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
-  ${OPENAIR_DIR}/radio/COMMON/record_player.c
-  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
-  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
-  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
-  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
-  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
-  ${PHY_INTERFACE_DIR}/queue_t.c
-  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
-  ${T_SOURCE}
-  ${SHLIB_LOADER_SOURCES}
-  )
-add_dependencies(ocp-enb oai_iqplayer coding params_libconfig rfsimulator)
-
-target_link_libraries (ocp-enb
-  -Wl,--start-group
-  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
-  PHY_COMMON PHY PHY_RU L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB MISC_NFAPI_LTE_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
-  ${RAL_LIB} ${NAS_UE_LIB} ITTI
-  -Wl,--end-group z dl)
-target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${CMAKE_DL_LIBS} ${LIB_LMS_LIBRARIES} ${T_LIB})
-
 add_executable(oairu
   ${OPENAIR_DIR}/executables/lte-ru.c
   ${OPENAIR_DIR}/executables/ru_control.c
@@ -2236,7 +2210,7 @@ target_link_libraries(oairu PRIVATE
   PHY_COMMON PHY_RU UTIL
   -Wl,--end-group z dl)
 
-target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${CMAKE_DL_LIBS} ${T_LIB})
+target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${T_LIB})
 target_link_libraries(oairu PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
 # force the generation of ASN.1 so that we don't need to wait during the build
@@ -2275,12 +2249,11 @@ target_link_libraries(lte-uesoftmodem PRIVATE
   lte_rrc nr_rrc s1ap x2ap m2ap m3ap
   SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
   PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${RAL_LIB} ${NAS_UE_LIB} ITTI ${ATLAS_LIBRARIES}
+  ${NAS_UE_LIB} ITTI ${ATLAS_LIBRARIES}
   -Wl,--end-group z dl)
 
 target_link_libraries(lte-uesoftmodem PRIVATE ${LIBXML2_LIBRARIES})
-target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${CMAKE_DL_LIBS} ${ATLAS_LIBRARIES})
-target_link_libraries(lte-uesoftmodem PRIVATE ${LIB_LMS_LIBRARIES})
+target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${ATLAS_LIBRARIES})
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
@@ -2317,14 +2290,13 @@ add_executable(nr-softmodem
 target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECU_CN SECU_OSA
-  ITTI ${RAL_LIB} ${NAS_UE_LIB} lte_rrc nr_rrc
+  ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
   ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
   x2ap f1ap m2ap m3ap e1ap
   -Wl,--end-group z dl)
 
 target_link_libraries(nr-softmodem PRIVATE ${LIBXML2_LIBRARIES})
-target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${CMAKE_DL_LIBS} ${ATLAS_LIBRARIES})
-target_link_libraries(nr-softmodem PRIVATE ${LIB_LMS_LIBRARIES})
+target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${ATLAS_LIBRARIES})
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
@@ -2385,12 +2357,11 @@ target_link_libraries(nr-uesoftmodem PRIVATE
   nr_rrc SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
   PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
   NFAPI_USER_LIB MISC_NFAPI_NR_LIB
-  ${RAL_LIB} ITTI ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU
+  ITTI ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU
   -Wl,--end-group z dl)
 
 target_link_libraries(nr-uesoftmodem PRIVATE ${LIBXML2_LIBRARIES})
-target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} ${ATLAS_LIBRARIES})
-target_link_libraries(nr-uesoftmodem PRIVATE ${LIB_LMS_LIBRARIES})
+target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${ATLAS_LIBRARIES})
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
@@ -2533,7 +2504,6 @@ target_link_libraries(nr_dlsim PRIVATE
   m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
   )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
-target_compile_definitions(nr_dlsim PUBLIC -DPHYSICAL_SIMULATOR)
 
 add_executable(nr_prachsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c
@@ -2585,7 +2555,6 @@ target_link_libraries(nr_ulsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON lte_rrc nr_rrc CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE x2ap SECU_CN ngap NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
   m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
   )
-target_compile_definitions(nr_ulsim PUBLIC -DPHYSICAL_SIMULATOR)
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
 
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
diff --git a/ci-scripts/Jenkinsfile-cluster b/ci-scripts/Jenkinsfile-cluster
index e3f7da6141..013fe744c3 100644
--- a/ci-scripts/Jenkinsfile-cluster
+++ b/ci-scripts/Jenkinsfile-cluster
@@ -155,14 +155,6 @@ pipeline {
             allParametersPresent = false
           }
 
-          if (params.ADB_IPAddress == null) {
-            echo "no ADB_IPAddress given"
-            allParametersPresent = false
-          }
-          if (params.ADB_Credentials == null) {
-            echo "no ADB_IPAddress given"
-            allParametersPresent = false
-          }
           if (params.OC_Credentials == null) {
             echo "no OC_Credentials given"
             allParametersPresent = false
@@ -207,14 +199,13 @@ pipeline {
             withCredentials([
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
             ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
               for (xmlFile in myXmlTestSuite) {
                 if (fileExists(xmlFile)) {
                   try {
-                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
                     buildStageStatus = false
diff --git a/ci-scripts/Jenkinsfile-physim-deploy b/ci-scripts/Jenkinsfile-physim-deploy
index a0ed1a2f80..2bdcac42aa 100644
--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -140,12 +140,6 @@ pipeline {
             allParametersPresent = false
           }
 
-          if (params.ADB_IPAddress == null) {
-            allParametersPresent = false
-          }
-          if (params.ADB_Credentials == null) {
-            allParametersPresent = false
-          }
           if (params.OC_Credentials == null) {
             allParametersPresent = false
           }
@@ -192,15 +186,14 @@ pipeline {
             withCredentials([
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
             ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
               String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
               for (xmlFile in myXmlTestSuite) {
                 if (fileExists(xmlFile)) {
                   try {
-                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
                     buildStageStatus = false
diff --git a/ci-scripts/Jenkinsfile-tmp-full-ran b/ci-scripts/Jenkinsfile-tmp-full-ran
index e4564d777e..a074ef3369 100644
--- a/ci-scripts/Jenkinsfile-tmp-full-ran
+++ b/ci-scripts/Jenkinsfile-tmp-full-ran
@@ -155,13 +155,6 @@ pipeline {
                         allParametersPresent = false
                     }
 
-                    if (params.ADB_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.ADB_Credentials == null) {
-                        allParametersPresent = false
-                    }
-
                     if (allParametersPresent) {
                         echo "All parameters are present"
                         if (eNB_AllowMergeRequestProcess) {
@@ -202,14 +195,13 @@ pipeline {
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
                         ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
                             String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                             for (xmlFile in myXmlTestSuite) {
                             if (fileExists(xmlFile)) {
                                 try {
-                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
                                     buildStageStatus = false
diff --git a/ci-scripts/Jenkinsfile-tmp-multi-enb b/ci-scripts/Jenkinsfile-tmp-multi-enb
index e0c756befb..f8a0216fff 100644
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb
@@ -150,13 +150,6 @@ pipeline {
                         allParametersPresent = false
                     }
 
-                    if (params.ADB_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.ADB_Credentials == null) {
-                        allParametersPresent = false
-                    }
-
                     if (allParametersPresent) {
                         echo "All parameters are present"
                         if (eNB_AllowMergeRequestProcess) {
@@ -198,14 +191,13 @@ pipeline {
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
                         ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
                             String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                             for (xmlFile in myXmlTestSuite) {
                                 if (fileExists(xmlFile)) {
                                     try {
-                                        sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
+                                        sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                                     } catch (Exception e) {
                                         currentBuild.result = 'FAILURE'
                                         buildStageStatus = false
@@ -220,20 +212,6 @@ pipeline {
         }
         stage ("Terminate") {
             parallel {
-                stage('Terminate UE') {
-                    // Bypassing this stage if there are no abd server defined
-                    when {
-                      expression { params.ADB_IPAddress != "none" }
-                    }
-                    steps {
-                        echo '\u2705 \u001B[32mTerminate UE\u001B[0m'
-                        withCredentials([
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
-                        ]) {
-                            sh "python3 ci-scripts/main.py --mode=TerminateUE --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password}"
-                        }
-                    }
-                }
                 stage('Terminate eNB') {
                     steps {
                         echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
diff --git a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
index 43d6372a33..e7f803b45c 100644
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -169,12 +169,6 @@ pipeline {
             allParametersPresent = false
           }
 
-          if (params.ADB_IPAddress == null) {
-            allParametersPresent = false
-          }
-          if (params.ADB_Credentials == null) {
-            allParametersPresent = false
-          }
           if (params.DataBaseHost == "none") {
             DataBaseHost = pythonExecutor
           }
@@ -220,15 +214,14 @@ pipeline {
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB1_Credentials}", usernameVariable: 'eNB1_Username', passwordVariable: 'eNB1_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB2_Credentials}", usernameVariable: 'eNB2_Username', passwordVariable: 'eNB2_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password']
             ]) {
-              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
               String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
               for (xmlFile in myXmlTestSuite) {
                 if (fileExists(xmlFile)) {
                   try {
-                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
+                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
                     buildStageStatus = false
diff --git a/ci-scripts/Jenkinsfile-tmp-ran b/ci-scripts/Jenkinsfile-tmp-ran
index 271b9d042a..037f7e6897 100644
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -89,10 +89,6 @@ pipeline {
         string(name: 'EPC_Type', defaultValue: 'ltebox', description: 'EPC type: OAI or ltebox')
         credentials(name: 'EPC_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for EPC')
         string(name: 'EPC_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of EPC source code')
-
-        //ADB server parameters
-        string(name: 'ADB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of ADB server')
-        credentials(name: 'ADB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for ADB')
     }
     */
 
@@ -171,13 +167,6 @@ pipeline {
                         allParametersPresent = false
                     }
 
-                    if (params.ADB_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.ADB_Credentials == null) {
-                        allParametersPresent = false
-                    }
-
                     if (allParametersPresent) {
                         echo "All parameters are present"
                         if (eNB_AllowMergeRequestProcess) {
@@ -217,14 +206,13 @@ pipeline {
                         withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
                         ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
                             String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                             for (xmlFile in myXmlTestSuite) {
                             if (fileExists(xmlFile)) {
                                 try {
-                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
                                     buildStageStatus = false
@@ -239,27 +227,6 @@ pipeline {
         }
         stage ("Terminate") {
             parallel {
-                stage('Terminate UE') {
-                    // Bypassing this stage if there are no abd server defined
-                    when {
-                      expression { params.ADB_IPAddress != "none" }
-                    }
-                    steps {
-                        echo '\u2705 \u001B[32mTerminate UE\u001B[0m'
-                        withCredentials([
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
-                        ]) {
-                            sh "python3 ci-scripts/main.py --mode=TerminateUE --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password}"
-                        }
-                    }
-                    post {
-                        success {
-                            script {
-                                termStatusArray[termUE] = true
-                            }
-                        }
-                    }
-                }
                 stage('Terminate eNB') {
                     steps {
                         echo '\u2705 \u001B[32mTerminate eNB\u001B[0m'
@@ -517,13 +484,6 @@ pipeline {
         // Making sure that we really shutdown every thing before leaving
         failure {
             script {
-                if ((!termStatusArray[termUE]) && (params.ADB_IPAddress != "none")) {
-                    withCredentials([
-                        [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
-                    ]) {
-                        sh "python3 ci-scripts/main.py --mode=TerminateUE --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password}"
-                    }
-                }
                 if (!termStatusArray[termENB]) {
                     withCredentials([
                         [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
diff --git a/ci-scripts/Jenkinsfile-tmp-ue b/ci-scripts/Jenkinsfile-tmp-ue
index 5a1e28d9f9..97e878cd25 100644
--- a/ci-scripts/Jenkinsfile-tmp-ue
+++ b/ci-scripts/Jenkinsfile-tmp-ue
@@ -142,13 +142,6 @@ pipeline {
                         allParametersPresent = false
                     }
 */
-                    if (params.ADB_IPAddress == null) {
-                        allParametersPresent = false
-                    }
-                    if (params.ADB_Credentials == null) {
-                        allParametersPresent = false
-                    }
-
                     if (allParametersPresent) {
                         echo "All parameters are present"
                         if (eNB_AllowMergeRequestProcess) {
@@ -187,14 +180,13 @@ pipeline {
                         }
                         withCredentials([
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.UE_Credentials}", usernameVariable: 'UE_Username', passwordVariable: 'UE_Password'],
-                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
                         ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
                             String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                             for (xmlFile in myXmlTestSuite) {
                             if (fileExists(xmlFile)) {
                                 try {
-                                    sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --XMLTestFile=${xmlFile}"
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
                                     buildStageStatus = false
diff --git a/ci-scripts/args_parse.py b/ci-scripts/args_parse.py
index 01e3eba465..07c1ce5db0 100644
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -227,23 +227,13 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
             matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
             EPC.ContainerPrefix=matchReg.group(1)
         elif re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ADBIPAddress = matchReg.group(1)
+            print("ignoring --ADBIPAddress parameter")
         elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ADBUserName = matchReg.group(1)
+            print("ignoring --ADBUserName parameter")
         elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE)
-            if re.match('centralized', matchReg.group(1), re.IGNORECASE) or re.match('distributed', matchReg.group(1), re.IGNORECASE):
-                if re.match('distributed', matchReg.group(1), re.IGNORECASE):
-                    CiTestObj.ADBCentralized = False
-                else:
-                    CiTestObj.ADBCentralized = True
-            else:
-                sys.exit('Invalid ADB Type: ' + matchReg.group(1) + ' -- (should be centralized or distributed)')
+            print("ignoring --ADBType parameter")
         elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ADBPassword = matchReg.group(1)
+            print("ignoring --ADBPassword parameter")
         elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.testXMLfiles.append(matchReg.group(1))
diff --git a/ci-scripts/build_fr1_from_yaml.py b/ci-scripts/build_fr1_from_yaml.py
index a5492df6f6..4687c3ee02 100755
--- a/ci-scripts/build_fr1_from_yaml.py
+++ b/ci-scripts/build_fr1_from_yaml.py
@@ -39,10 +39,6 @@ def main():
            '--ranAllowMerge=' + params['ranAllowMerge'] + ' ' + \
            '--ranTargetBranch=' + params['ranTargetBranch'] + ' ' + \
            \
-           '--ADBIPAddress=' + params['ADB']['ADBIPAddress'] + ' ' + \
-           '--ADBUserName=' + params['ADB']['ADBUserName'] + ' ' + \
-           '--ADBPassword=' + params['ADB']['ADBPassword'] + ' ' + \
-           \
            '--UEIPAddress=' + params['UE']['UEIPAddress'] + ' ' + \
            '--UEUserName=' + params['UE']['UEUserName'] + ' ' + \
            '--UEPassword=' + params['UE']['UEPassword'] + ' ' + \
diff --git a/ci-scripts/build_fr1_template.yaml b/ci-scripts/build_fr1_template.yaml
index 5c7b2fc6f4..bedeeb09d7 100755
--- a/ci-scripts/build_fr1_template.yaml
+++ b/ci-scripts/build_fr1_template.yaml
@@ -12,12 +12,6 @@ steps:
   - TesteNB,xml_files/fr1_nsa_base_next.xml #ue toggle, nodes initialize, ue toggle, ping, nodes terminate
   - TesteNB,xml_files/fr1_epc_closure.xml
 
-
-ADB: #on Caracal
-  ADBIPAddress : 172.21.16.132
-  ADBUserName : oaici
-  ADBPassword : KkexF6CErOi1fNuebCPsuIVK
-
 RAN:
     - eNBIPAddress : 192.168.18.199 #eNB on Minimassive
       eNBUserName : oaicicd
diff --git a/ci-scripts/ci_ctl_adb.sh b/ci-scripts/ci_ctl_adb.sh
new file mode 100755
index 0000000000..25fd4d0afc
--- /dev/null
+++ b/ci-scripts/ci_ctl_adb.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+usage() {
+  echo "usage: $0 <command> <id>"
+  echo "available commands: initialize, attach, detach, terminate, check"
+}
+
+if [ $# -ne 2 ]; then
+  usage
+  exit 1
+fi
+
+cmd=$1
+id=$2
+
+flightmode_off() {
+  set +x
+  adb -s $id shell "/data/local/tmp/on"
+}
+
+flightmode_on() {
+  set +x
+  adb -s $id shell "/data/local/tmp/off"
+}
+
+initialize() {
+  set +x
+  adb -s $id shell "svc data enable"   # make sure data services are enabled
+  flightmode_on
+}
+
+terminate() {
+  echo "terminate: does nothing"
+}
+
+check() {
+  declare -A service=( ["0"]="IN_SERVICE" ["1"]="OUT_OF_SERVICE" ["2"]="EMERGENCY_ONLY" ["3"]="RADIO_POWERED_OFF")
+  declare -A data=( ["0"]="DISCONNECTED" ["1"]="CONNECTING" ["2"]="CONNECTED" ["3"]="SUSPENDED")
+  serv_idx=$(adb -s $id shell "dumpsys telephony.registry" | sed -n 's/.*mServiceState=\([0-3]\).*/\1/p')
+  data_idx=$(adb -s $id shell "dumpsys telephony.registry" | sed -n 's/.*mDataConnectionState=\([0-3]\).*/\1/p')
+  data_reason=$(adb -s $id shell "dumpsys telephony.registry" | sed -n 's/.*mDataConnectionReason=\([0-9a-zA-Z_]\+\).*/\1/p')
+  #echo "Status Check UE $id"
+  echo "Service State: ${service[$serv_idx]}"
+  echo "Data State:    ${data[$data_idx]}"
+  echo "Data Reason:   ${data_reason}"
+}
+
+case "${cmd}" in
+  initialize) initialize;;
+  attach) flightmode_off;;
+  detach) flightmode_on;;
+  terminate) terminate;;
+  check) check;;
+  *) echo "Invalid command $cmd"; usage; exit 1;;
+esac
diff --git a/ci-scripts/ci_ctl_qtel.py b/ci-scripts/ci_ctl_qtel.py
index 3785d7ee89..4567c07d68 100644
--- a/ci-scripts/ci_ctl_qtel.py
+++ b/ci-scripts/ci_ctl_qtel.py
@@ -33,7 +33,6 @@ import sys
 import time
 import serial
 
-
 class qtel_ctl:
 	#---------------
 	#private methods
@@ -75,12 +74,15 @@ class qtel_ctl:
         self.__set_modem_state(self.modem,'0')
 
 
-
-
 if __name__ == "__main__":
     #argv[1] : usb port
     #argv[2] : qtel command (see function pointers dict "wup", "detach" etc ...)
-    command = sys.argv[2]
-    Module=qtel_ctl(sys.argv[1])
+	if len(sys.argv) >= 3:
+		command = sys.argv[2]
+		print(command)
+		Module=qtel_ctl(sys.argv[1])
     #calling the function to be applied
-    Module.cmd_dict[command]()
+		Module.cmd_dict[command]()
+		print(Module.cmd_dict[command])
+	else:
+		print("To many arguments")
diff --git a/ci-scripts/ci_ueinfra.yaml b/ci-scripts/ci_ueinfra.yaml
index 76ebaf0f97..23d6aee785 100644
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -1,106 +1,128 @@
 idefix:
-  ID: idefix
-  State : enabled
-  Kind : quectel
-  Process : 
-    Name : quectel-CM
-    Cmd : /home/oaicicd/quectel-CM/quectel-CM -4 -s
-    Apn :
-      ltebox : oai.ipv4
-  WakeupScript : ci_ctl_qtel.py /dev/ttyUSB2 wup
-  DetachScript : ci_ctl_qtel.py /dev/ttyUSB2 detach
-  LogStore : /media/usb-drive/ci_qlogs
-  PLMN : 22201
-  UENetwork : wwan0 
-  HostIPAddress : 172.21.16.135
-  HostUsername : oaicicd
-  HostPassword : oaicicd
-  HostSourceCodePath : none
-  MTU : 1500
+  Host: idefix
+  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quectel-cm.log &
+  TermScript: sudo -S killall --signal SIGKILL quectel-CM
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
+  UENetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+  Trace: True
+  LogStore: /media/usb-drive/ci_qlogs
 nrmodule2_quectel:
-  ID: nrmodule2_quectel
-  State : enabled
-  Kind : quectel
-  Process :
-    Name : quectel-CM
-    Cmd : /home/nrmodule2/quectel-CM/quectel-CM -4 -s
-    Apn :
-      OAICN5G : oai
-      OAI-Rel14-Docker : oai.ipv4
-  WakeupScript : ci_ctl_qtel.py /dev/ttyUSB2 wup
-  DetachScript : ci_ctl_qtel.py /dev/ttyUSB2 detach
-  LogStore : /media/ci_qlogs  
-  PLMN : 20897
-  UENetwork : wwan0
-  HostIPAddress : 172.21.16.139
-  HostUsername : nrmodule2 
-  HostPassword : linux 
-  HostSourceCodePath : none
-  StartCommands :
-    - sudo -S ip link set dev wwan1 mtu 1500
-  MTU : 1500
+  Host: nrmodule2
+  InitScript: sudo stdbuf -oL /home/nrmodule2/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
+  TermScript: sudo -S killall --signal SIGKILL quectel-CM
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
+  UENetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+  LogStore: /media/ci_qlogs
 
-# CAUTION: 192.168.18.89 address has to be changed when the server is moved
-#single UE single ping
+adb_ue_1:
+  Host: nano
+  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize 5200a933fee93521
+  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate 5200a933fee93521
+  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach 5200a933fee93521
+  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach 5200a933fee93521
+  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check 5200a933fee93521
+  DataEnableScript: adb -s 5200a933fee93521 shell "svc data enable"
+  DataDisableScript: adb -s 5200a933fee93521 shell "svc data disable"
+  UENetworkScript: adb -s 5200a933fee93521 shell "ip address show | grep rmnet"
+  CmdPrefix: adb -s 5200a933fee93521 shell
+  MTU: 1500
+  LogStore: /media/usb-drive/ci_adb_1-logs
+adb_ue_2:
+  Host: nano
+  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize 5200c00db4413517
+  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate 5200c00db4413517
+  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach 5200c00db4413517
+  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach 5200c00db4413517
+  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check 5200c00db4413517
+  DataEnableScript: adb -s 5200c00db4413517 shell "svc data enable"
+  DataDisableScript: adb -s 5200c00db4413517 shell "svc data disable"
+  UENetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
+  CmdPrefix: adb -s 5200c00db4413517 shell
+  MTU: 1500
+  LogStore: /media/usb-drive/ci_adb_2-logs
+
+amarisoft_ue:
+  Host: amariue
+  InitScript: nohup /root/NV18-06-2022/ue/lteue /root/NV18-06-2022/ue/config/oaicicd-ue-ci-test.cfg &
+  TermScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"quit"}'
 amarisoft_ue_1:
-  ID: amarisoft_ue_1
-  State : enabled
-  Kind : amarisoft
-  #not required for AS config but needed for py script
-  WakeupScript : none
-  DetachScript : none
-  #end 
-  Cmd : /root/NV18-06-2022/ue/lteue
-  Config : /root/NV17-12-21/ue/config/oaicicd-ue-Ping-SATest.cfg 
-  Duration : 60
-  Ping : /tmp/test_ue1.log
-  UELog : /tmp/ue1.log
-  HostIPAddress : 172.21.16.144
-  HostUsername : root
-  HostPassword : toor 
-  HostSourceCodePath : /tmp
-
-
-#an other scenario example
-#notice : this will not work as such, only suggestion for multi ue scenario
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
+  UENetworkScript: ip netns exec ue1 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue1
+  MTU: 1500
 amarisoft_ue_2:
-  ID: amarisoft_ue_2
-  State : enabled
-  Kind : amarisoft
-  #not required for AS config but needed for py script
-  WakeupScript : none
-  DetachScript : none
-  #end 
-  Cmd : /root/NV18-06-2022/ue/lteue
-  Config : /root/NV17-12-21/ue/config/xxxxxxx.cfg #to be updated for an other scenario 
-  Duration : 60
-  Ping :
-    - /tmp/test_ue1.log #to be updated fo an other scenario
-    - /tmp/test_ue2.log #could be a list for a multi ue scenario
-  UELog :
-    - /tmp/ue1.log
-    - /tmp/ue1.log
-  HostIPAddress : 192.168.18.89
-  HostUsername : root
-  HostPassword : toor 
-  HostSourceCodePath : /tmp
-
-
-#do not remove
-dummy:
-  ID: ''
-  State : ''
-  Kind : ''
-  Process : 
-    Name : ''
-    Cmd : ''
-  WakeupScript : ''
-  DetachScript : ''
-  PLMN : 22201
-  UENetwork : wwan0
-  HostIPAddress : 172.21.16.135
-  HostUsername : oaicicd
-  HostPassword : oaicicd
-  HostSourceCodePath : none
-
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
+  UENetworkScript: ip netns exec ue2 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue2
+  MTU: 1500
+amarisoft_ue_3:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
+  UENetworkScript: ip netns exec ue3 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue3
+  MTU: 1500
+amarisoft_ue_4:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
+  UENetworkScript: ip netns exec ue4 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue4
+  MTU: 1500
+amarisoft_ue_5:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
+  UENetworkScript: ip netns exec ue5 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue5
+  MTU: 1500
+amarisoft_ue_6:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
+  UENetworkScript: ip netns exec ue6 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue6
+  MTU: 1500
+amarisoft_ue_7:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
+  UENetworkScript: ip netns exec ue7 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue7
+  MTU: 1500
+amarisoft_ue_8:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
+  UENetworkScript: ip netns exec ue8 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue8
+  MTU: 1500
+amarisoft_ue_9:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
+  UENetworkScript: ip netns exec ue9 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue9
+  MTU: 1500
+amarisoft_ue_10:
+  Host: amariue
+  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
+  UENetworkScript: ip netns exec ue10 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue10
+  MTU: 1500
 
+oai_ue_obelix:
+  Host: obelix
+  UENetworkScript: ip a show dev oaitun_ue1
+  IF: oaitun_ue1
diff --git a/ci-scripts/cls_amarisoft_ue.py b/ci-scripts/cls_amarisoft_ue.py
deleted file mode 100644
index 9f4976792d..0000000000
--- a/ci-scripts/cls_amarisoft_ue.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-#   Required Python Version
-#     Python 3.x
-#
-#---------------------------------------------------------------------
-
-#to use isfile
-import os
-import sys
-import logging
-#to create a SSH object locally in the methods
-import sshconnection
-#time.sleep
-import time
-
-
-import re
-import subprocess
-
-from datetime import datetime
-
-
-class AS_UE:
-
-	def __init__(self,Module):
-		#create attributes as in the UE dictionary
-		for k, v in Module.items():
-			setattr(self, k, v)
-	
-
-
-
-#-----------------$
-#PUBLIC Methods$
-#-----------------$
-
-	def WaitEndScenario(self):
-		logging.debug('waiting for scenario duration')
-		time.sleep(int(self.Duration))
-
-	def KillASUE(self):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		mySSH.command('killall --signal SIGKILL lteue-avx2', '\$', 5)
-		mySSH.close()
-
-	def RunScenario(self):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-
-		logging.debug("Deleting old artifacts :")
-		cmd='rm -rf ' + self.Ping + ' ' + self.UELog 
-		mySSH.command(cmd, '\$',5)
-		logging.debug("Running scenario :")
-		cmd='echo $USER; nohup '+self.Cmd + ' ' + self.Config + ' &'
-		mySSH.command(cmd, '\$',5)
-
-		mySSH.close()
-
-
-
diff --git a/ci-scripts/cls_ci_ueinfra.py b/ci-scripts/cls_ci_ueinfra.py
deleted file mode 100644
index 0326a92a4f..0000000000
--- a/ci-scripts/cls_ci_ueinfra.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-#   Required Python Version
-#     Python 3.x
-#
-#---------------------------------------------------------------------
-
-#to use isfile
-import os
-import sys
-import logging
-#to create a SSH object locally in the methods
-import sshconnection
-#time.sleep
-import time
-#to load ue infrastructure dictionary
-import yaml
-
-class InfraUE:
-	def __init__(self):
-		self.ci_ue_infra ={}
-
-
-#-----------------$
-#PUBLIC Methods$
-#-----------------$
-
-	#This method reads the yaml file describing the multi-UE infrastructure
-	#and stores the infra permanently in the related class attribute self.ci_ue_infra
-	def Get_UE_Infra(self,ue_infra_filename):
-		f_yaml=ue_infra_filename
-		with open(f_yaml,'r') as file:
-			logging.debug('Loading UE infrastructure from file '+f_yaml)
-			#load it permanently in the class attribute
-			self.ci_ue_infra = yaml.load(file,Loader=yaml.FullLoader)
-
-
-
diff --git a/ci-scripts/cls_cmd.py b/ci-scripts/cls_cmd.py
index 8694502fe2..acf1f6e0d2 100644
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -32,10 +32,17 @@ import os
 import paramiko
 import uuid
 
+# helper that returns either LocalCmd or RemoteCmd based on passed host name
+def getConnection(host, d=None):
+	if host is None or host.lower() in ["", "none", "localhost"]:
+		return LocalCmd(d=d)
+	else:
+		return RemoteCmd(host, d=d)
+
 # provides a partial interface for the legacy SSHconnection class (getBefore(), command())
 class Cmd(metaclass=abc.ABCMeta):
 	def cd(self, d, silent=False):
-		if d == None or d == '' or d == []:
+		if d == None or d == '':
 			self.cwd = None
 		elif d[0] == '/':
 			self.cwd = d
@@ -51,9 +58,13 @@ class Cmd(metaclass=abc.ABCMeta):
 	def run(self, line, timeout=300, silent=False):
 		return
 
-	@abc.abstractmethod
-	def command(self, commandline, expectedline, timeout, silent=False, resync=False):
-		return
+	def command(self, commandline, expectedline=None, timeout=300, silent=False, resync=False):
+		splitted = commandline.split(' ')
+		if splitted[0] == 'cd':
+			self.cd(' '.join(splitted[1:]), silent)
+		else:
+			self.run(commandline, timeout, silent)
+		return 0
 
 	@abc.abstractmethod
 	def close(self):
@@ -82,7 +93,12 @@ class LocalCmd(Cmd):
 		if not silent:
 			logging.info(line)
 		try:
-			ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
+			if line.strip().endswith('&'):
+				# if we wait for stdout, subprocess does not return before the end of the command
+				# however, we don't want to wait for commands with &, so just return fake command
+				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5)
+			else:
+				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
 		except Exception as e:
 			ret = sp.CompletedProcess(args=line, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
 		if ret.stdout is None:
@@ -93,14 +109,6 @@ class LocalCmd(Cmd):
 		self.cp = ret
 		return ret
 
-	def command(self, commandline, expectedline=None, timeout=300, silent=False, resync=False):
-		line = [s for s in commandline.split(' ') if len(s) > 0]
-		if line[0] == 'cd':
-			self.cd(line[1], silent)
-		else:
-			self.run(line, timeout, silent)
-		return 0
-
 	def close(self):
 		pass
 
@@ -108,16 +116,14 @@ class LocalCmd(Cmd):
 		return self.cp.stdout
 
 	def copyin(self, scpIp, scpUser, scpPw, src, tgt):
-		logging.warning("LocalCmd emulating sshconnection.copyin() function")
 		self.run(f'cp -r {src} {tgt}')
 
 	def copyout(self, scpIp, scpUser, scpPw, src, tgt):
-		logging.warning("LocalCmd emulating sshconnection.copyout() function")
 		self.run(f'cp -r {src} {tgt}')
 
 class RemoteCmd(Cmd):
 	def __init__(self, hostname, d=None):
-		logging.getLogger('paramiko').setLevel(logging.INFO) # prevent spamming through Paramiko
+		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
 		self.client = paramiko.SSHClient()
 		self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 		cfg = RemoteCmd._lookup_ssh_config(hostname)
@@ -146,33 +152,27 @@ class RemoteCmd(Cmd):
 		return cfg
 
 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
-		if type(line) is list:
-			line = ' '.join(line)
 		if not silent:
-			logging.debug(line)
+			logging.info(line)
 		if self.cwd:
 			line = f"cd {self.cwd} && {line}"
-		args = line.split(' ')
 		try:
-			stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
-			ret = sp.CompletedProcess(args=args, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
+			if line.strip().endswith('&'):
+				# if we wait for stdout, Paramiko does not return before the end of the command
+				# however, we don't want to wait for commands with &, so just return fake command
+				self.client.exec_command(line, timeout = 5)
+				ret = sp.CompletedProcess(args=line, returncode=0, stdout=b'')
+			else:
+				stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
+				ret = sp.CompletedProcess(args=line, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
 		except Exception as e:
-			ret = sp.CompletedProcess(args=args, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
+			ret = sp.CompletedProcess(args=line, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
 		ret.stdout = ret.stdout.decode('utf-8').strip()
 		if reportNonZero and ret.returncode != 0:
-			cmd = ' '.join(ret.args)
-			logging.warning(f'command "{cmd}" returned non-zero returncode {ret.returncode}: output:\n{ret.stdout}')
+			logging.warning(f'command "{line}" returned non-zero returncode {ret.returncode}: output:\n{ret.stdout}')
 		self.cp = ret
 		return ret
 
-	def command(self, commandline, expectedline=None, timeout=300, silent=False, resync=False):
-		line = [s for s in commandline.split(' ') if len(s) > 0]
-		if line[0] == 'cd':
-			self.cd(line[1], silent)
-		else:
-			self.run(line, timeout, silent)
-		return 0
-
 	def close(self):
 		self.client.close()
 
@@ -180,7 +180,6 @@ class RemoteCmd(Cmd):
 		return self.cp.stdout
 
 	def copyout(self, src, tgt, recursive=False):
-		logging.warning("RemoteCmd emulating sshconnection.copyout() function, ignoring scpIp")
 		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
@@ -198,7 +197,6 @@ class RemoteCmd(Cmd):
 			sftp.close()
 
 	def copyin(self, src, tgt, recursive=False):
-		logging.warning("RemoteCmd emulating sshconnection.copyout() function")
 		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 8d4175fe24..4c7701842e 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -927,24 +927,21 @@ class Containerize():
 			mySSH.copyin(lIpAddr, lUserName, lPassWord, logfilename, '.')
 		mySSH.close()
 
-		html_queue = SimpleQueue()
-		html_cell = '<pre style="background-color:white">\n'
+		message = ''
 		if usedImage != '':
-			html_cell += f'Used Image = {usedImage} :\n'
-			html_cell += imageInfo
+			message += f'Used Image = {usedImage} :\n'
+			message += imageInfo
 		else:
-			html_cell += 'Could not retrieve used image info!\n'
+			message += 'Could not retrieve used image info!\n'
 		if status:
-			html_cell += '\nHealthy deployment!\n'
+			message += '\nHealthy deployment!\n'
 		else:
-			html_cell += '\nUnhealthy deployment! -- Check logs for reason!\n'
-		html_cell += '</pre>'
-		html_queue.put(html_cell)
+			message += '\nUnhealthy deployment! -- Check logs for reason!\n'
 		if status:
-			HTML.CreateHtmlTestRowQueue('N/A', 'OK', CONST.ENB_PROCESS_OK, html_queue)
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [message])
 		else:
 			self.exitStatus = 1
-			HTML.CreateHtmlTestRowQueue('N/A', 'KO', CONST.ENB_PROCESS_OK, html_queue)
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', [message])
 
 
 	def UndeployObject(self, HTML, RAN):
@@ -1116,37 +1113,30 @@ class Containerize():
 			else:
 				time.sleep(10)
 
-		imagesInfo = ''
+		html_cell = ''
 		for newCont in newContainers:
 			if newCont == 'rfsim4g-db-init':
 				continue
 			cmd = 'docker inspect -f "{{.Config.Image}}" ' + newCont
 			imageInspect = myCmd.run(cmd, timeout=30, silent=True)
 			imageName = str(imageInspect.stdout).strip()
-			cmd = 'docker image inspect --format "{{.RepoTags}}\t{{.Size}} bytes\t{{.Created}}\t{{.Id}}" ' + imageName
+			cmd = 'docker image inspect --format \'{{.RepoTags}}\t{{.Size}} bytes\t{{index (split .Created ".") 0}}\n{{.Id}}\' ' + imageName
 			imageInspect = myCmd.run(cmd, 30, silent=True)
-			imagesInfo += imageInspect.stdout.strip()
+			html_cell += imageInspect.stdout + '\n'
 		myCmd.close()
 
-		html_queue = SimpleQueue()
-		html_cell = '<pre style="background-color:white">\n'
-		for imageInfo in imagesInfo.split('\n'):
-			html_cell += imageInfo[:-11] + '\n'
-		html_cell += '\n'
 		for cState in containerStatus:
 			html_cell += cState + '\n'
-		html_cell += '</pre>'
-		html_queue.put(html_cell)
 		if count == 100 and healthy == self.nb_healthy[0]:
 			if self.tsharkStarted == False:
 				logging.debug('Starting tshark on public network')
 				self.CaptureOnDockerNetworks()
-			HTML.CreateHtmlTestRowQueue('n/a', 'OK', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue('n/a', 'OK', [html_cell])
 			for cState in containerStatus:
 				logging.debug(cState)
 			logging.info('\u001B[1m Deploying OAI Object(s) PASS\u001B[0m')
 		else:
-			HTML.CreateHtmlTestRowQueue('Could not deploy in time', 'KO', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue('Could not deploy in time', 'KO', [html_cell])
 			for cState in containerStatus:
 				logging.debug(cState)
 			logging.error('\u001B[1m Deploying OAI Object(s) FAILED\u001B[0m')
@@ -1357,10 +1347,7 @@ class Containerize():
 				message += statLine + '\n'
 		myCmd.close()
 
-		html_queue = SimpleQueue()
-		html_cell = '<pre style="background-color:white">\n' + message + '</pre>'
-		html_queue.put(html_cell)
-		HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', 1, html_queue)
+		HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
 
 	def PingFromContainer(self, HTML, RAN, UE):
 		myCmd = cls_cmd.LocalCmd()
@@ -1419,14 +1406,11 @@ class Containerize():
 			logging.info('\u001B[1m Ping Test PASS\u001B[0m')
 
 	def PingExit(self, HTML, RAN, UE, status, message):
-		html_queue = SimpleQueue()
-		html_cell = '<pre style="background-color:white">UE\n' + message + '</pre>'
-		html_queue.put(html_cell)
 		if status:
-			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
 		else:
 			logging.error('\u001B[1;37;41m ping test FAIL -- ' + message + ' \u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', [message])
 			# Automatic undeployment
 			logging.warning('----------------------------------------')
 			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
@@ -1475,14 +1459,12 @@ class Containerize():
 		self.IperfExit(HTML, RAN, UE, iperfStatus, msg)
 
 	def IperfExit(self, HTML, RAN, UE, status, message):
-		html_queue = SimpleQueue()
-		html_cell = '<pre style="background-color:white">UE\n' + message + '</pre>'
-		html_queue.put(html_cell)
+		html_cell = f'UE\n{message}'
 		if status:
-			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'OK', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'OK', [html_cell])
 		else:
 			logging.error('\u001B[1m Iperf Test FAIL -- ' + message + ' \u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', [html_cell])
 			# Automatic undeployment
 			logging.warning('----------------------------------------')
 			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
diff --git a/ci-scripts/cls_cots_ue.py b/ci-scripts/cls_cots_ue.py
deleted file mode 100644
index 59c2713b47..0000000000
--- a/ci-scripts/cls_cots_ue.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
-#
-#   Required Python Version
-#     Python 3.x
-#
-#   Required Python Package
-#     pexpect
-#---------------------------------------------------------------------
-
-#to use isfile
-import os
-import sys
-#to use logging.info()
-import logging
-#to create a SSH object locally in the methods
-import sshconnection
-#time.sleep
-import time
-#to load cots_ue dictionary
-import yaml
-
-class CotsUe:
-	def __init__(self,ADBIPAddr,ADBUserName,ADBPassWord):
-		self.cots_id = '' #cots id from yaml oppo, s10 etc...
-		self.ADBIPAddr = ADBIPAddr 
-		self.ADBUserName = ADBUserName
-		self.ADBPassWord = ADBPassWord
-		self.cots_run_mode = '' #on of off to toggle airplane mode on/off
-		self.__cots_cde_dict_file = 'cots_ue_ctl.yaml'
-		self.__SetAirplaneRetry = 3
-
-
-#-----------------$
-#PUBLIC Methods$
-#-----------------$
-
-	def Check_Airplane(self):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.ADBIPAddr, self.ADBUserName, self.ADBPassWord)
-		status=mySSH.cde_check_value('adb shell settings get global airplane_mode_on ', ['0','1'],5)
-		mySSH.close()
-		return status
-
-	#simply check if the device id exists in the dictionary
-	#returns true if it exists, false otherwise
-	def Check_Exists(self,target_id):
-		#load cots commands dictionary
-		if (os.path.isfile(self.__cots_cde_dict_file)):
-			yaml_file=self.__cots_cde_dict_file
-		elif (os.path.isfile('ci-scripts/'+self.__cots_cde_dict_file)):
-			yaml_file='ci-scripts/'+self.__cots_cde_dict_file
-		else:
-			logging.error("COTS UE dictionary yaml file cannot be found")
-			sys.exit("COTS UE dictionary yaml file cannot be found")
-		
-		#load cots commands dictionary
-		with open(yaml_file,'r') as file:
-			cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader)
-		#check if ue id is in the dictionary
-		if target_id in cots_ue_ctl:
-			return True
-		else:
-			return False
-
-	def Set_Airplane(self, target_id, target_state_str):
-		#loading cots commands dictionary
-
-		if (os.path.isfile(self.__cots_cde_dict_file)):
-			yaml_file=self.__cots_cde_dict_file
-		elif (os.path.isfile('ci-scripts/'+self.__cots_cde_dict_file)):
-			yaml_file='ci-scripts/'+self.__cots_cde_dict_file
-		else:
-			logging.error("COTS UE dictionary yaml file cannot be found")
-			sys.exit("COTS UE dictionary yaml file cannot be found")
-		
-		#load cots commands dictionary
-		with open(yaml_file,'r') as file:
-			cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader)
-		#check if ue id is in the dictionary
-		if target_id in cots_ue_ctl:
-			mySSH = sshconnection.SSHConnection()
-			mySSH.open(self.ADBIPAddr, self.ADBUserName, self.ADBPassWord)
-			logging.info(str(self.ADBIPAddr)+' '+str(self.ADBUserName)+' '+str(self.ADBPassWord))
-			mySSH.command('adb start-server','\$',5)
-			mySSH.command('adb devices','\$',5)
-			logging.info("Toggling COTS UE Airplane mode to : "+target_state_str)
-			#get current state
-			current_state = self.Check_Airplane()
-			if target_state_str.lower()=="on": 
-				target_state=1
-			else:
-				target_state=0
-			if current_state != target_state:
-				#toggle state
-				retry = 0 
-				while (current_state!=target_state) and (retry < self.__SetAirplaneRetry):
-					#loop over the command list from dictionary for the selected ue, to switch to required state
-					for i in range (0,len(cots_ue_ctl[target_id])):
-						mySSH.command(cots_ue_ctl[target_id][i], '\$', 5)
-					time.sleep(1)
-					current_state = self.Check_Airplane()
-					retry+=1
-				#could not toggle despite the retry
-				if current_state != target_state:
-					logging.error("ATTENTION : Could not toggle to : "+target_state_str)
-					logging.error("Current state is : "+ str(current_state))
-			else:
-				logging.info("Airplane mode is already "+ target_state_str)
-			mySSH.command('adb kill-server','\$',5)
-			mySSH.close()
-		#ue id is NOT in the dictionary
-		else:
-			logging.error("COTS UE Id from XML could not be found in UE YAML dictionary " + self.__cots_cde_dict_file)
-			sys.exit("COTS UE Id from XML could not be found in UE YAML dictionary " + self.__cots_cde_dict_file)
-
-
-
-
diff --git a/ci-scripts/cls_module_ue.py b/ci-scripts/cls_module_ue.py
index dcf75a34fc..7fb7882b8d 100644
--- a/ci-scripts/cls_module_ue.py
+++ b/ci-scripts/cls_module_ue.py
@@ -28,177 +28,197 @@
 import os
 import sys
 import logging
-#to create a SSH object locally in the methods
-import sshconnection
 #time.sleep
 import time
-
-
 import re
 import subprocess
-
 from datetime import datetime
+import yaml
 
 #for log rotation mgt
 import cls_log_mgt
+import cls_cmd
 
 class Module_UE:
 
-	def __init__(self,Module):
-		#create attributes as in the Module dictionary
-		for k, v in Module.items():
-			setattr(self, k, v)
-		self.UEIPAddress = ""
-		#dictionary linking command names and related module scripts
-		self.cmd_dict= {"wup": self.WakeupScript,"detach":self.DetachScript}#dictionary of function scripts
-		self.ue_trace=''		
+	def __init__(self, module_name, filename="ci_ueinfra.yaml"):
+		with open(filename, 'r') as f:
+			all_ues = yaml.load(f, Loader=yaml.FullLoader)
+			m = all_ues.get(module_name)
+			if m is None:
+				raise Exception(f'no such module name "{module_name}" in "{filename}"')
+			self.module_name = module_name
+			self.host = m['Host']
+			self.cmd_dict = {
+				"attach": m.get('AttachScript'),
+				"detach": m.get('DetachScript'),
+				"initialize": m.get('InitScript'),
+				"terminate": m.get('TermScript'),
+				"getNetwork": m.get('UENetworkScript'),
+				"check": m.get('CheckStatusScript'),
+				"dataEnable": m.get('DataEnableScript'),
+				"dataDisable": m.get('DataDisableScript'),
+			}
+			self.interface = m.get('IF')
+			self.MTU = m.get('MTU')
+			self.trace = m.get('trace') == True
+			self.logStore = m.get('LogStore')
+			self.cmd_prefix = m.get('CmdPrefix')
+			logging.info(f'initialized UE {self.module_name}@{self.host} from {filename}')
 
+	def __str__(self):
+		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
 
+	def __repr__(self):
+		return self.__str__()
+
+	def _command(self, cmd, silent = False):
+		if cmd is None:
+			raise Exception("no command provided")
+		if self.host == "" or self.host == "localhost":
+			c = cls_cmd.LocalCmd()
+		else:
+			c = cls_cmd.RemoteCmd(self.host)
+		response = c.run(cmd, silent=silent)
+		c.close()
+		return response.stdout
 
 #-----------------$
 #PUBLIC Methods$
 #-----------------$
 
-	#this method checks if the specified Process is running on the server hosting the module
-	#if not it will be started
-	def CheckCMProcess(self,CNType):
-		HOST=self.HostUsername+'@'+self.HostIPAddress
-		COMMAND="ps aux | grep --colour=never " + self.Process['Name'] + " | grep -v grep "
-		logging.debug(COMMAND)
-		ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-		result = ssh.stdout.readlines()
-		if len(result)!=0:
-			logging.debug(self.Process['Name'] + " process found")
-			return True 
-		else:#start process and check again  
-			logging.debug(self.Process['Name'] + " process NOT found")
-			#starting the process
-			logging.debug('Starting ' + self.Process['Name'])
-			mySSH = sshconnection.SSHConnection()
-			mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-			mySSH.command('echo ' + self.HostPassword + ' | sudo -S rm -f /tmp/quectel-cm.log','\$',5)
-			mySSH.command('echo $USER; echo ' + self.HostPassword + ' | nohup sudo -S stdbuf -o0 ' + self.Process['Cmd'] + ' ' +  self.Process['Apn'][CNType]  + ' > /tmp/quectel-cm.log 2>&1 &','\$',5)
-			mySSH.close()
-			#checking the process
+	def initialize(self):
+		if self.trace:
+			raise Exception("UE tracing not implemented yet")
+			self._enableTrace()
+		# we first terminate to make sure the UE has been stopped
+		if self.cmd_dict["detach"]:
+			self._command(self.cmd_dict["detach"], silent=True)
+		self._command(self.cmd_dict["terminate"], silent=True)
+		self._command(self.cmd_dict["initialize"])
+
+	def terminate(self):
+		self._command(self.cmd_dict["terminate"])
+		if self.trace:
+			raise Exception("UE tracing not implemented yet")
+			self._disableTrace()
+			return self._logCollect()
+		return None
+
+	def attach(self, attach_tries = 4, attach_timeout = 60):
+		ip = None
+		while attach_tries > 0:
+			self._command(self.cmd_dict["attach"])
+			timeout = attach_timeout
+			logging.debug("Waiting for IP address to be assigned")
+			while timeout > 0 and not ip:
+				time.sleep(5)
+				timeout -= 5
+				ip = self.getIP()
+			if ip:
+				break
+			logging.warning(f"UE did not receive IP address after {attach_timeout} s, detaching")
+			attach_tries -= 1
+			self._command(self.cmd_dict["detach"])
 			time.sleep(5)
-			HOST=self.HostUsername+'@'+self.HostIPAddress
-			COMMAND="ps aux | grep --colour=never " + self.Process['Name'] + " | grep -v grep "
-			logging.debug(COMMAND)
-			ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-			result = ssh.stdout.readlines()
-			if len(result)!=0:
-				logging.debug(self.Process['Name'] + " process found")
-				return True
-			else:
-				logging.debug(self.Process['Name'] + " process NOT found")
-				return False 
-
-	#Generic command function, using function pointers dictionary
-	def Command(self,cmd):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		mySSH.command('echo ' + self.HostPassword + ' | sudo -S python3 ' + self.cmd_dict[cmd],'\$',10)
-		time.sleep(5)
-		logging.debug("Module "+ cmd)
-		mySSH.close()
-
-
-	#this method retrieves the Module IP address (not the Host IP address) 
-	def GetModuleIPAddress(self):
-		HOST=self.HostUsername+'@'+self.HostIPAddress
-		response= []
-		tentative = 8
-		while (len(response)==0) and (tentative>0):
-			COMMAND="ip a show dev " + self.UENetwork + " | grep --colour=never inet | grep " + self.UENetwork
-			if tentative == 8:
-				logging.debug(COMMAND)
-			ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-			response = ssh.stdout.readlines()
-			tentative-=1
-			time.sleep(2)
-		if (tentative==0) and (len(response)==0):
-			logging.debug('\u001B[1;37;41m Module IP Address Not Found! Time expired \u001B[0m')
-			return -1
-		else: #check response
-			result = re.search('inet (?P<moduleipaddress>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', response[0].decode("utf-8") )
-			if result is not None: 
-				if result.group('moduleipaddress') is not None: 
-					self.UEIPAddress = result.group('moduleipaddress')
-					logging.debug('\u001B[1mUE Module IP Address is ' + self.UEIPAddress + '\u001B[0m')
-					return 0
-				else:
-					logging.debug('\u001B[1;37;41m Module IP Address Not Found! \u001B[0m')
-					return -1
-			else:
-				logging.debug('\u001B[1;37;41m Module IP Address Not Found! \u001B[0m')
-				return -1
-
-	def CheckModuleMTU(self):
-		HOST=self.HostUsername+'@'+self.HostIPAddress
-		response= []
-		tentative = 3 
-		while (len(response)==0) and (tentative>0):
-			COMMAND="ip a show dev " + self.UENetwork + " | grep --colour=never mtu"
-			logging.debug(COMMAND)
-			ssh = subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-			response = ssh.stdout.readlines()
-			tentative-=1
-			time.sleep(10)
-		if (tentative==0) and (len(response)==0):
-			logging.debug('\u001B[1;37;41m Module NIC MTU Not Found! Time expired \u001B[0m')
-			return -1
-		else: #check response
-			result = re.search('mtu (?P<mtu>[0-9]+)', response[0].decode("utf-8") )
-			if result is not None: 
-				if (result.group('mtu') is not None) and (str(result.group('mtu'))==str(self.MTU)) : 
-					logging.debug('\u001B[1mUE Module NIC MTU is ' + str(self.MTU) + ' as expected\u001B[0m')
-					return 0
-				else:
-					logging.debug('\u001B[1;37;41m Incorrect Module NIC MTU ' + str(result.group('mtu')) + '! Expected : ' + str(self.MTU) + '\u001B[0m')
-					return -1
-			else:
-				logging.debug('\u001B[1;37;41m Module NIC MTU Not Found! \u001B[0m')
-				return -1
-
-	def EnableTrace(self):
-		if self.ue_trace=="yes":
-			mySSH = sshconnection.SSHConnection()
-			mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-			#delete old artifacts
-			mySSH.command('echo ' + self.HostPassword + ' | sudo -S rm -rf ci_qlog','\$',5)
-			#start Trace, artifact is created in home dir
-			mySSH.command('echo $USER; nohup sudo -E QLog/QLog -s ci_qlog -f NR5G.cfg > /dev/null 2>&1 &','\$', 5)
-			mySSH.close()
-
-	def DisableTrace(self):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		mySSH.command('echo ' + self.HostPassword + ' | sudo -S killall --signal=SIGINT *QLog*', '\$',5)
-		mySSH.close()
-
-
-	def DisableCM(self):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		mySSH.command('echo ' + self.HostPassword + ' | sudo -S killall --signal SIGKILL *'+self.Process['Name']+'*', '\$', 5)
-		mySSH.close()
-
-
-	def LogCollect(self):
-		if self.ue_trace=="yes":
-			mySSH = sshconnection.SSHConnection()
-			mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-			#archive qlog to USB stick in /media/usb-drive/ci_qlogs with datetime suffix
-			now=datetime.now()
-			now_string = now.strftime("%Y%m%d-%H%M")
-			source='ci_qlog'
-			destination= self.LogStore + '/ci_qlog_'+now_string+'.zip'
-			#qlog artifact is zipped into the target folder
-			mySSH.command('echo $USER; echo ' + self.HostPassword + ' | nohup sudo -S zip -r '+destination+' '+source+' > /dev/null 2>&1 &','\$', 10)
-			mySSH.close()
-			#post action : log cleaning to make sure enough space is reserved for the next run
-			Log_Mgt=cls_log_mgt.Log_Mgt(self.HostUsername,self.HostIPAddress, self.HostPassword, self.LogStore)
-			Log_Mgt.LogRotation()
+		if ip:
+			logging.debug(f'\u001B[1mUE IP Address is {ip}\u001B[0m')
 		else:
-			destination=""
+			logging.debug('\u001B[1;37;41mUE IP Address Not Found!\u001B[0m')
+		return ip
+
+	def detach(self):
+		self._command(self.cmd_dict["detach"])
+
+	def check(self):
+		cmd = self.cmd_dict["check"]
+		if cmd:
+			return self._command(cmd)
+		else:
+			logging.warning(f"requested status check of UE {self.getName()}, but operation is not supported")
+			return f"UE {self.getName()} does not support status checking"
+
+	def dataEnable(self):
+		cmd = self.cmd_dict["dataEnable"]
+		if cmd:
+			self._command(cmd)
+			return True
+		else:
+			message = f"requested enabling data of UE {self.getName()}, but operation is not supported"
+			logging.error(message)
+			return False
+
+	def dataDisable(self):
+		cmd = self.cmd_dict["dataDisable"]
+		if cmd:
+			self._command(cmd)
+			return True
+		else:
+			message = f"requested disabling data of UE {self.getName()}, but operation is not supported"
+			logging.error(message)
+			return False
+
+	def getIP(self):
+		output = self._command(self.cmd_dict["getNetwork"], silent=True)
+		result = re.search('inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output)
+		if result and result.group('ip'):
+			ip = result.group('ip')
+			return ip
+		return None
+
+	def checkMTU(self):
+		output = self._command(self.cmd_dict["getNetwork"], silent=True)
+		result = re.search('mtu (?P<mtu>[0-9]+)', output)
+		if result and result.group('mtu') and int(result.group('mtu')) == self.MTU:
+			logging.debug('\u001B[1mUE Module NIC MTU is ' + str(self.MTU) + ' as expected\u001B[0m')
+			return True
+		else:
+			logging.debug('\u001B[1;37;41m Incorrect Module NIC MTU or MTU not found! Expected: ' + str(self.MTU) + '\u001B[0m')
+			return False
+
+	def getName(self):
+		return self.module_name
+
+	def getIFName(self):
+		return self.interface
+
+	def getHost(self):
+		return self.host
+
+	def getCmdPrefix(self):
+		return self.cmd_prefix if self.cmd_prefix else ""
+
+	def _enableTrace(self):
+		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		#delete old artifacts
+		mySSH.command('echo ' + ' '  + ' | sudo -S rm -rf ci_qlog','\$',5)
+		#start Trace, artifact is created in home dir
+		mySSH.command('echo $USER; nohup sudo -E QLog/QLog -s ci_qlog -f NR5G.cfg > /dev/null 2>&1 &','\$', 5)
+		mySSH.close()
+
+	def _disableTrace(self):
+		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		mySSH.command('echo ' + ' '  + ' | sudo -S killall --signal=SIGINT *QLog*', '\$',5)
+		mySSH.close()
+
+
+	def _logCollect(self):
+		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		#archive qlog to USB stick in /media/usb-drive/ci_qlogs with datetime suffix
+		now=datetime.now()
+		now_string = now.strftime("%Y%m%d-%H%M")
+		source='ci_qlog'
+		destination= self.LogStore + '/ci_qlog_'+now_string+'.zip'
+		#qlog artifact is zipped into the target folder
+		mySSH.command('echo $USER; echo ' + ' '  + ' | nohup sudo -S zip -r '+destination+' '+source+' > /dev/null 2>&1 &','\$', 10)
+		mySSH.close()
+		#post action : log cleaning to make sure enough space is reserved for the next run
+		Log_Mgt=cls_log_mgt.Log_Mgt(self.HostUsername,self.HostIPAddress, self.HostPassword, self.LogStore)
 		return destination
+
diff --git a/ci-scripts/cls_oai_html.py b/ci-scripts/cls_oai_html.py
index 48123f52ad..48a88a8590 100644
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -84,16 +84,6 @@ class HTMLManagement():
 		self.CpuModel = ['', '']
 		self.CpuMHz = ['', '']
 
-#-----------------------------------------------------------
-# Setters and Getters
-#-----------------------------------------------------------
-
-	def SethtmlUEConnected(self, nbUEs):
-		if nbUEs > 0:
-			self.htmlUEConnected = nbUEs
-		else:
-			self.htmlUEConnected = 1
-
 
 
 #-----------------------------------------------------------
@@ -101,7 +91,7 @@ class HTMLManagement():
 #-----------------------------------------------------------
 
 
-	def CreateHtmlHeader(self, ADBIPAddress):
+	def CreateHtmlHeader(self):
 		if (not self.htmlHeaderCreated):
 			logging.info('\u001B[1m----------------------------------------\u001B[0m')
 			logging.info('\u001B[1m  Creating HTML header \u001B[0m')
@@ -116,7 +106,7 @@ class HTMLManagement():
 			self.htmlFile.write('  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>\n')
 			self.htmlFile.write('  <title>Test Results for TEMPLATE_JOB_NAME job build #TEMPLATE_BUILD_ID</title>\n')
 			self.htmlFile.write('</head>\n')
-			self.htmlFile.write('<body><div class="container">\n')
+			self.htmlFile.write('<body><div class="container-fluid" style="margin-left:1em; margin-right:1em">\n')
 			self.htmlFile.write('  <br>\n')
 			self.htmlFile.write('  <table style="border-collapse: collapse; border: none;">\n')
 			self.htmlFile.write('    <tr style="border-collapse: collapse; border: none;">\n')
@@ -183,15 +173,6 @@ class HTMLManagement():
 				self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('  </table>\n')
 
-			if (ADBIPAddress != 'none') and (ADBIPAddress != 'modules'):
-				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(self.htmlNb_Smartphones) + ' UE(s) is(are) connected to ADB bench server</h2>\n')
-				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(self.htmlNb_CATM_Modules) + ' CAT-M UE(s) is(are) connected to bench server</h2>\n')
-			elif (ADBIPAddress == 'modules'):
-				self.htmlUEConnected = 1
-				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> 1 commercial module is connected to CI bench</h2>\n')
-			else:
-				self.htmlUEConnected = 1
-				self.htmlFile.write('  <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> 1 OAI UE(s) is(are) connected to CI bench</h2>\n')
 			self.htmlFile.write('  <br>\n')
 			self.htmlFile.write('  <ul class="nav nav-pills">\n')
 			count = 0
@@ -225,16 +206,13 @@ class HTMLManagement():
 				self.htmlFile.write('  <div id="build-tab" class="tab-pane fade">\n')
 			self.htmlFile.write('  <table class="table" border = "1">\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
-			self.htmlFile.write('        <th>Relative Time (s)</th>\n')
-			self.htmlFile.write('        <th>Test Id</th>\n')
+			self.htmlFile.write('        <th style="width:5%">Relative Time (s)</th>\n')
+			self.htmlFile.write('        <th style="width:5%">Test Id</th>\n')
 			self.htmlFile.write('        <th>Test Desc</th>\n')
 			self.htmlFile.write('        <th>Test Options</th>\n')
-			self.htmlFile.write('        <th>Test Status</th>\n')
+			self.htmlFile.write('        <th style="width:5%">Test Status</th>\n')
 
-			i = 0
-			while (i < self.htmlUEConnected):
-				self.htmlFile.write('        <th>UE' + str(i) + ' Status</th>\n')
-				i += 1
+			self.htmlFile.write('        <th>Info</th>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()
 		self.htmlHeaderCreated = True
@@ -247,14 +225,14 @@ class HTMLManagement():
 					testOkEvenIfUnstable = True
 			self.htmlFile = open('test_results.html', 'a')
 			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <th bgcolor = "#33CCFF" colspan=3>Final Tab Status</th>\n')
+			self.htmlFile.write('        <th bgcolor = "#33CCFF" colspan="3">Final Tab Status</th>\n')
 			if passStatus:
-				self.htmlFile.write('        <th bgcolor = "green" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
+				self.htmlFile.write('        <th bgcolor = "green" colspan="3"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
 			else:
 				if testOkEvenIfUnstable:
-					self.htmlFile.write('        <th bgcolor = "orange" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">KNOWN UNSTABLE SCENARIO <span class="glyphicon glyphicon-exclamation-sign"></span> </font></th>\n')
+					self.htmlFile.write('        <th bgcolor = "orange" colspan="3"><font color="white">KNOWN UNSTABLE SCENARIO <span class="glyphicon glyphicon-exclamation-sign"></span> </font></th>\n')
 				else:
-					self.htmlFile.write('        <th bgcolor = "red" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
+					self.htmlFile.write('        <th bgcolor = "red" colspan="3"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  </div>\n')
@@ -287,45 +265,12 @@ class HTMLManagement():
 			self.htmlFile.write('  <p></p>\n')
 			self.htmlFile.write('  <table class="table table-condensed">\n')
 
-			machines = [ 'eNB', 'UE' ]
-			for machine in machines:
-				if machine == 'eNB':
-					idx = 0
-				else:
-					idx = 1
-				if self.OsVersion[idx] == '':
-					continue
-
-				self.htmlFile.write('      <tr>\n')
-				self.htmlFile.write('        <th colspan=8>' + str(machine) + ' Server Characteristics</th>\n')
-				self.htmlFile.write('      </tr>\n')
-				self.htmlFile.write('      <tr>\n')
-				self.htmlFile.write('        <td>OS Version</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.OsVersion[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>Kernel Version</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.KernelVersion[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>UHD Version</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.UhdVersion[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>USRP Board</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.UsrpBoard[idx] + '</span></td>\n')
-				self.htmlFile.write('      </tr>\n')
-				self.htmlFile.write('      <tr>\n')
-				self.htmlFile.write('        <td>Nb CPUs</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuNb[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>CPU Model Name</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuModel[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td>CPU Frequency</td>\n')
-				self.htmlFile.write('        <td><span class="label label-default">' + self.CpuMHz[idx] + '</span></td>\n')
-				self.htmlFile.write('        <td></td>\n')
-				self.htmlFile.write('        <td></td>\n')
-				self.htmlFile.write('      </tr>\n')
-
 			self.htmlFile.write('      <tr>\n')
-			self.htmlFile.write('        <th colspan=5 bgcolor = "#33CCFF">Final Status</th>\n')
+			self.htmlFile.write('        <th colspan="5" bgcolor = "#33CCFF">Final Status</th>\n')
 			if passStatus:
-				self.htmlFile.write('        <th colspan=3 bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>\n')
+				self.htmlFile.write('        <th colspan="3" bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>\n')
 			else:
-				self.htmlFile.write('        <th colspan=3 bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
+				self.htmlFile.write('        <th colspan="3" bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  <p></p>\n')
@@ -338,7 +283,7 @@ class HTMLManagement():
 		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
 			self.htmlFile = open('test_results.html', 'a')
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- Try Run #' + str(cntnumfails) + ' ---- </b></td>\n')
+			self.htmlFile.write('        <td colspan="6"><b> ---- Try Run #' + str(cntnumfails) + ' ---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()
 
@@ -404,7 +349,7 @@ class HTMLManagement():
 				result = re.search('showed|Reestablishment|Could not copy eNB logfile', self.htmleNBFailureMsg)
 				if result is not None:
 					cellBgColor = 'orange'
-			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmleNBFailureMsg + '</pre></td>\n')
+			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan="1"><pre style="background-color:' + cellBgColor + '">' + self.htmleNBFailureMsg + '</pre></td>\n')
 			self.htmleNBFailureMsg = ''
 		elif (len(str(self.htmlUEFailureMsg)) > 2):
 			cellBgColor = 'white'
@@ -415,13 +360,10 @@ class HTMLManagement():
 				result = re.search('showed|Could not copy UE logfile|oaitun_ue1 interface is either NOT mounted or NOT configured', self.htmlUEFailureMsg)
 				if result is not None:
 					cellBgColor = 'orange'
-			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmlUEFailureMsg + '</pre></td>\n')
+			self.htmlFile.write('        <td bgcolor = "' + cellBgColor + '" colspan="1"><pre style="background-color:' + cellBgColor + '">' + self.htmlUEFailureMsg + '</pre></td>\n')
 			self.htmlUEFailureMsg = ''
 		else:
-			i = 0
-			while (i < self.htmlUEConnected):
-				self.htmlFile.write('        <td>-</td>\n')
-				i += 1
+			self.htmlFile.write('        <td>-</td>\n')
 		self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()
 
@@ -432,7 +374,7 @@ class HTMLManagement():
 		self.htmlFile = open('test_results.html', 'a')
 		if bool(collectInfo) == False:
 			self.htmlFile.write('      <tr bgcolor = "red" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ----IMAGES BUILDING FAILED - Unable to recover the image logs ---- </b></td>\n')
+			self.htmlFile.write('        <td colspan="6"><b> ----IMAGES BUILDING FAILED - Unable to recover the image logs ---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 		else:
 			for image in collectInfo:
@@ -444,13 +386,13 @@ class HTMLManagement():
 					self.htmlFile.write('      <tr bgcolor = "red" >\n')
 				else:
 					self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-				self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- ' + image  + ' IMAGE STATUS ----> Size ' + allImagesSize[image] + ' </b></td>\n')
+				self.htmlFile.write('        <td colspan="6"><b> ---- ' + image  + ' IMAGE STATUS ----> Size ' + allImagesSize[image] + ' </b></td>\n')
 				self.htmlFile.write('      </tr>\n')
 				self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 				self.htmlFile.write('        <th colspan="2">Element</th>\n')
 				self.htmlFile.write('        <th>Nb Errors</th>\n')
 				self.htmlFile.write('        <th>Nb Warnings</th>\n')
-				self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + '>Status</th>\n')
+				self.htmlFile.write('        <th colspan="2">Status</th>\n')
 				self.htmlFile.write('      </tr>\n')
 
 				for fil in files:
@@ -469,11 +411,11 @@ class HTMLManagement():
 					else:
 						self.htmlFile.write('        <td bgcolor = "orange" >' + str(parameters['warnings'])  + '</td>\n')
 					if (parameters['errors'] == 0) and (parameters['warnings'] == 0):
-						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "green" ><font color="white">OK </font></th>\n')
+						self.htmlFile.write('        <th colspan="2" bgcolor = "green" ><font color="white">OK </font></th>\n')
 					elif (parameters['errors'] == 0):
-						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "orange" ><font color="white">OK </font></th>\n')
+						self.htmlFile.write('        <th colspan="2" bgcolor = "orange" ><font color="white">OK </font></th>\n')
 					else:
-						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "red" > NOT OK  </th>\n')
+						self.htmlFile.write('        <th colspan="2" bgcolor = "red" > NOT OK  </th>\n')
 					self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()
 
@@ -485,12 +427,12 @@ class HTMLManagement():
 		
         # TabHeader 
 		self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-		self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- ' + DataLog['Title'] + ' ---- </b></td>\n')
+		self.htmlFile.write('        <td colspan="6"><b> ---- ' + DataLog['Title'] + ' ---- </b></td>\n')
 		self.htmlFile.write('      </tr>\n')
 		self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 		self.htmlFile.write('        <th colspan="3">'+ DataLog['ColNames'][0] +'</th>\n')
 		self.htmlFile.write('        <th colspan="2">' + DataLog['ColNames'][1] + '</th>\n')
-		self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + '>'+ DataLog['ColNames'][2] +'</th>\n')
+		self.htmlFile.write('        <th colspan="2">'+ DataLog['ColNames'][2] +'</th>\n')
 		self.htmlFile.write('      </tr>\n')
 
 		for k in DataLog['Data']:
@@ -506,7 +448,7 @@ class HTMLManagement():
 		self.htmlFile.close()
 
 
-	def CreateHtmlTestRowQueue(self, options, status, ue_status, ue_queue):
+	def CreateHtmlTestRowQueue(self, options, status, infoList):
 		if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
 			self.htmlFile = open('test_results.html', 'a')
 			currentTime = int(round(time.time() * 1000)) - self.startTime
@@ -517,25 +459,20 @@ class HTMLManagement():
 			self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
 			self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
 			if (str(status) == 'OK'):
-				self.htmlFile.write('        <td bgcolor = "lightgreen" >' + str(status)  + '</td>\n')
+				self.htmlFile.write(f'        <td bgcolor = "lightgreen" >{status}</td>\n')
 			elif (str(status) == 'KO'):
-				self.htmlFile.write('        <td bgcolor = "lightcoral" >' + str(status)  + '</td>\n')
+				self.htmlFile.write(f'        <td bgcolor = "lightcoral" >{status}</td>\n')
 			else:
 				addOrangeBK = True
-				self.htmlFile.write('        <td bgcolor = "orange" >' + str(status)  + '</td>\n')
-			i = 0
-			while (i < self.htmlUEConnected):
-				if (i < ue_status):
-					if (not ue_queue.empty()):
-						if (addOrangeBK):
-							self.htmlFile.write('        <td bgcolor = "orange" >' + str(ue_queue.get()).replace('white', 'orange') + '</td>\n')
-						else:
-							self.htmlFile.write('        <td>' + str(ue_queue.get()) + '</td>\n')
-					else:
-						self.htmlFile.write('        <td>-</td>\n')
-				else:
-					self.htmlFile.write('        <td>-</td>\n')
-				i += 1
+				self.htmlFile.write(f'        <td bgcolor = "orange" >{status}</td>\n')
+			if (addOrangeBK):
+				self.htmlFile.write('        <td bgcolor = "orange" >')
+			else:
+				self.htmlFile.write('        <td>')
+			for i in infoList:
+				self.htmlFile.write(f'         <pre>{i}</pre>')
+
+			self.htmlFile.write('                </td>')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()
 
@@ -546,80 +483,80 @@ class HTMLManagement():
 		vId = 0
 		for version in CCR.versions:
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> Results for cppcheck v ' + version + ' </b></td>\n')
+			self.htmlFile.write('        <td colspan="6"><b> Results for cppcheck v ' + version + ' </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> NB ERRORS</b></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB ERRORS</b></td>\n')
 			if CCR.nbErrors[vId] == 0:
 				myColor = 'lightgreen'
 			elif CCR.nbErrors[vId] < 20:
 				myColor = 'orange'
 			else:
 				myColor = 'lightcoral'
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + ' bgcolor = "' + myColor + '"><b>' + str(CCR.nbErrors[vId]) + '</b></td>\n')
+			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbErrors[vId]) + '</b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> NB WARNINGS</b></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB WARNINGS</b></td>\n')
 			if CCR.nbWarnings[vId] == 0:
 				myColor = 'lightgreen'
 			elif CCR.nbWarnings[vId] < 20:
 				myColor = 'orange'
 			else:
 				myColor = 'lightcoral'
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + ' bgcolor = "' + myColor + '"><b>' + str(CCR.nbWarnings[vId]) + '</b></td>\n')
+			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbWarnings[vId]) + '</b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '> ----------------- </td>\n')
+			self.htmlFile.write('        <td colspan="6"> ----------------- </td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Memory leak</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbMemLeaks[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Memory leak</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbMemLeaks[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Possible null pointer deference</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbNullPtrs[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Possible null pointer deference</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbNullPtrs[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Uninitialized variable</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbUninitVars[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Uninitialized variable</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbUninitVars[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Undefined behaviour shifting</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbTooManyBitsShift[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Undefined behaviour shifting</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbTooManyBitsShift[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Signed integer overflow</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbIntegerOverflow[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Signed integer overflow</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbIntegerOverflow[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '> </td>\n')
+			self.htmlFile.write('        <td colspan="6"> </td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Printf formatting issues</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbInvalidPrintf[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Printf formatting issues</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbInvalidPrintf[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Modulo result is predetermined</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbModuloAlways[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Modulo result is predetermined</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbModuloAlways[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Opposite Condition -> dead code</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbOppoInnerCondition[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Opposite Condition -> dead code</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbOppoInnerCondition[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td></td>\n')
-			self.htmlFile.write('        <td colspan=2 bgcolor = "lightcyan" ><b> Wrong Scanf Nb Args</b></td>\n')
-			self.htmlFile.write('        <td colspan=' + str(2+self.htmlUEConnected) + '>' + str(CCR.nbWrongScanfArg[vId]) + '</td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Wrong Scanf Nb Args</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbWrongScanfArg[vId]) + '</td>\n')
 			self.htmlFile.write('      </tr>\n')
 			vId += 1
 
@@ -629,12 +566,12 @@ class HTMLManagement():
 		self.htmlFile = open('test_results.html', 'a')
 		if bool(testResult) == False and bool(testSummary) == False:
 			self.htmlFile.write('      <tr bgcolor = "red" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ----PHYSIM TESTING FAILED - Unable to recover the test logs ---- </b></td>\n')
+			self.htmlFile.write('        <td colspan="6"><b> ----PHYSIM TESTING FAILED - Unable to recover the test logs ---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 		else:
 		# Tab header
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- PHYSIM TEST SUMMARY---- </b></td>\n')
+			self.htmlFile.write('        <td colspan="6"><b> ---- PHYSIM TEST SUMMARY---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 			self.htmlFile.write('        <th colspan="2">LogFile Name</th>\n')
@@ -652,27 +589,27 @@ class HTMLManagement():
 			self.htmlFile.write('        <td gcolor = "lightcyan" >' + str(testSummary['Nbpass']) + ' </td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
-			self.htmlFile.write('        <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- PHYSIM TEST DETAIL INFO---- </b></td>\n')
+			self.htmlFile.write('        <td colspan="6"><b> ---- PHYSIM TEST DETAIL INFO---- </b></td>\n')
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 			self.htmlFile.write('        <th colspan="2">Test Name</th>\n')
 			self.htmlFile.write('        <th colspan="2">Test Description</th>\n')
-			self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + '>Result</th>\n')
+			self.htmlFile.write('        <th colspan="2">Result</th>\n')
 			self.htmlFile.write('      </tr>\n')
 			y = ''
 			for key, value in testResult.items():
 				x = key.split(".")
 				if x[0] != y:
 					self.htmlFile.write('      <tr bgcolor = "lightgreen" >\n')
-					self.htmlFile.write('        <td style="text-align: center;" colspan=' + str(5+self.htmlUEConnected) + '><b>"' + x[0] + '" series </b></td>\n')
+					self.htmlFile.write('        <td style="text-align: center;" colspan="6"><b>"' + x[0] + '" series </b></td>\n')
 					self.htmlFile.write('      </tr>\n')
 					y = x[0]
 				self.htmlFile.write('      <tr>\n')
 				self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + key  + ' </td>\n')
 				self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + value[0]  + '</td>\n')
 				if 'PASS' in value:
-					self.htmlFile.write('        <td colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "green" >' + value[1]  + '</td>\n')
+					self.htmlFile.write('        <td colspan="2" bgcolor = "green" >' + value[1]  + '</td>\n')
 				else:
-					self.htmlFile.write('        <td colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "red" >' + value[1]  + '</td>\n')
+					self.htmlFile.write('        <td colspan="2" bgcolor = "red" >' + value[1]  + '</td>\n')
 
 		self.htmlFile.close()
diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 51e43109a0..72d948ce94 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -44,6 +44,7 @@ import datetime
 import signal
 import statistics as stat
 from multiprocessing import Process, Lock, SimpleQueue
+import concurrent.futures
 
 #import our libs
 import helpreadme as HELP
@@ -51,8 +52,7 @@ import constants as CONST
 import sshconnection
 
 import cls_module_ue
-import cls_amarisoft_ue
-import cls_ci_ueinfra		#class defining the multi Ue infrastrucure
+import cls_cmd
 
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import matplotlib.pyplot as plt
@@ -144,10 +144,6 @@ class OaiCiTest():
 		self.ranTargetBranch = ''
 
 		self.FailReportCnt = 0
-		self.ADBIPAddress = ''
-		self.ADBUserName = ''
-		self.ADBPassword = ''
-		self.ADBCentralized = True
 		self.testCase_id = ''
 		self.testXMLfiles = []
 		self.testUnstable = False
@@ -171,8 +167,6 @@ class OaiCiTest():
 		self.UEDevicesOffCmd = []
 		self.UEDevicesOnCmd = []
 		self.UEDevicesRebootCmd = []
-		self.CatMDevices = []
-		self.UEIPAddresses = []
 		self.idle_sleep_time = 0
 		self.x2_ho_options = 'network'
 		self.x2NbENBs = 0
@@ -190,9 +184,7 @@ class OaiCiTest():
 		self.Initialize_OAI_UE_args = ''
 		self.clean_repository = True
 		self.air_interface=''
-		self.expectedNbOfConnectedUEs = 0
-		self.ue_id = '' #used for module identification
-		self.ue_trace ='' #used to enable QLog trace for Module UE, passed to Module UE object at InitializeUE()
+		self.ue_ids = []
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
 
@@ -300,139 +292,17 @@ class OaiCiTest():
 			HTML.CreateHtmlTabFooter(False)
 			self.ConditionalExit()
 
-	def InitializeUE_common(self, device_id, idx,COTS_UE):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			if not self.ADBCentralized:
-				# Reboot UE
-				#SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesRebootCmd[idx], '\$', 60)
-				# Wait
-				#time.sleep(60)
-				# Put in LTE-Mode only
-				#SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode 11"\'', '\$', 60)
-				#SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode1 11"\'', '\$', 60)
-				#SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode2 11"\'', '\$', 60)
-				#SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode3 11"\'', '\$', 60)
-				# enable data service
-				#SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
-				# we need to do radio on/off cycle to make sure of above changes
-				# airplane mode off // radio on
-				#SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
-				#time.sleep(10)
-				# airplane mode on // radio off
-				#SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
 
-				# normal procedure without reboot
-				# enable data service
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
-				# airplane mode on // radio off
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
-				SSH.close()
-				return
-
-			#RH quick add-on to integrate cots control defined by yaml
-			#if device_id exists in yaml dictionary, we execute the new procedure defined in cots_ue class
-			#otherwise we use the legacy procedure
-			logging.debug('Device id ' + str(device_id) + ', in COTS UE dict : ' + str(COTS_UE.Check_Exists(device_id)))
-			if COTS_UE.Check_Exists(device_id):
-				#switch device to Airplane mode ON (ie Radio OFF) 
-				COTS_UE.Set_Airplane(device_id, 'ON')
-			else:
-				# enable data service
-				SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data enable"', '\$', 60)
-
-				# The following commands are deprecated since we no longer work on Android 7+
-				# SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell settings put global airplane_mode_on 1', '\$', 10)
-				# SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell am broadcast -a android.intent.action.AIRPLANE_MODE --ez state true', '\$', 60)
-				# a dedicated script has to be installed inside the UE
-				# airplane mode on means call /data/local/tmp/off
-				if device_id == '84B7N16418004022':
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
-				else:
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
-				#airplane mode off means call /data/local/tmp/on
-				logging.debug('\u001B[1mUE (' + device_id + ') Initialize Completed\u001B[0m')
-				SSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def InitializeUE(self,HTML,RAN,EPC, COTS_UE, InfraUE,ue_trace,CONTAINERS):
-		if self.ue_id=='':#no ID specified, then it is a COTS controlled by ADB
-			if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-				HELP.GenericHelp(CONST.Version)
-				sys.exit('Insufficient Parameter')
-			multi_jobs = []
-			i = 0
-			for device_id in self.UEDevices:
-				p = Process(target = self.InitializeUE_common, args = (device_id,i,COTS_UE,))
-				p.daemon = True
-				p.start()
-				multi_jobs.append(p)
-				i += 1
-			for job in multi_jobs:
-				job.join()
-			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		else: #if an ID is specified, it is a UE from the yaml infrastructure file
-			ue_kind = InfraUE.ci_ue_infra[self.ue_id]['Kind']
-			logging.debug("Detected UE Kind : " + ue_kind)
-
-			#case it is a quectel module (only 1 at a time supported at the moment)
-			if ue_kind == 'quectel':
-				Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id])
-				Module_UE.ue_trace=ue_trace
-				is_module=Module_UE.CheckCMProcess(EPC.Type)
-				if is_module:
-					Module_UE.EnableTrace()
-					time.sleep(5)
-
-					# Looping attach / detach / wait to be successful at least once
-					cnt = 0
-					status = -1
-					while cnt < 4:
-						Module_UE.Command("wup")
-						logging.debug("Waiting for IP address to be assigned")
-						time.sleep(5)
-						logging.debug("Retrieve IP address")
-						status=Module_UE.GetModuleIPAddress()
-						if status==0:
-							cnt = 10
-						else:
-							cnt += 1
-							Module_UE.Command("detach")
-							time.sleep(20)
-
-					if cnt == 10 and status == 0:
-						HTML.CreateHtmlTestRow(Module_UE.UEIPAddress, 'OK', CONST.ALL_PROCESSES_OK)	
-						logging.debug('UE IP addresss : '+ Module_UE.UEIPAddress)
-						#execute additional commands from yaml file after UE attach
-						SSH = sshconnection.SSHConnection()
-						SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-						if hasattr(Module_UE,'StartCommands'):
-							for startcommand in Module_UE.StartCommands:
-								cmd = 'echo ' + Module_UE.HostPassword + ' | ' + startcommand
-								SSH.command(cmd,'\$',5)
-						SSH.close()
-						#check that the MTU is as expected / requested
-						Module_UE.CheckModuleMTU()
-					else: #status==-1 failed to retrieve IP address
-						HTML.CreateHtmlTestRow('N/A', 'KO', CONST.UE_IP_ADDRESS_ISSUE)
-						self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-						return
-
-			#case it is a amarisoft ue (only 1 at a time supported at the moment)
-			elif ue_kind == 'amarisoft':
-				AS_UE = cls_amarisoft_ue.AS_UE(InfraUE.ci_ue_infra[self.ue_id])
-				HTML.CreateHtmlTestRow(AS_UE.Config, 'OK', CONST.ALL_PROCESSES_OK)
-				AS_UE.RunScenario()
-				AS_UE.WaitEndScenario()
-				AS_UE.KillASUE()
-
-			else:
-				logging.debug("Incorrect UE Kind was detected")								
+	def InitializeUE(self, HTML):
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		with concurrent.futures.ThreadPoolExecutor() as executor:
+			futures = [executor.submit(ue.initialize) for ue in ues]
+			[f.result() for f in futures]
+		messages = [f'UE {ue.getName()}: initialized' for ue in ues]
+		HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 
 
-	def InitializeOAIUE(self,HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS):
+	def InitializeOAIUE(self,HTML,RAN,EPC,CONTAINERS):
 		if self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '' or self.UESourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
@@ -443,11 +313,6 @@ class OaiCiTest():
 			if result is None:
 				check_eNB = True
 				check_OAI_UE = False
-				pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-				if (pStatus < 0):
-					HTML.CreateHtmlTestRow(self.air_interface + ' ' + self.Initialize_OAI_UE_args, 'KO', pStatus)
-					HTML.CreateHtmlTabFooter(False)
-					self.ConditionalExit()
 			UE_prefix = ''
 		else:
 			UE_prefix = 'NR '
@@ -629,11 +494,6 @@ class OaiCiTest():
 		if fullSyncStatus and gotSyncStatus and tunnelInterfaceStatus:
 			HTML.CreateHtmlTestRow(self.air_interface + ' ' + self.Initialize_OAI_UE_args, 'OK', CONST.ALL_PROCESSES_OK, 'OAI UE')
 			logging.debug('\u001B[1m Initialize OAI UE Completed\u001B[0m')
-			if (self.ADBIPAddress != 'none'):
-				self.UEDevices = []
-				self.UEDevices.append('OAI-UE')
-				self.UEDevicesStatus = []
-				self.UEDevicesStatus.append(CONST.UE_STATUS_DETACHED)
 		else:
 			if self.air_interface == 'lte-uesoftmodem':
 				if RAN.eNBmbmsEnables[0]:
@@ -645,856 +505,67 @@ class OaiCiTest():
 				HTML.htmlUEFailureMsg='nr-uesoftmodem did NOT synced'
 				HTML.CreateHtmlTestRow(self.air_interface + ' ' +  self.Initialize_OAI_UE_args, 'KO', CONST.OAI_UE_PROCESS_COULD_NOT_SYNC, 'OAI UE')
 			logging.error('\033[91mInitialize OAI UE Failed! \033[0m')
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
-	def checkDevTTYisUnlocked(self):
-		SSH = sshconnection.SSHConnection()
-		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-		count = 0
-		while count < 5:
-			SSH.command('echo ' + self.ADBPassword + ' | sudo -S lsof | grep --colour=never ttyUSB0', '\$', 10)
-			result = re.search('picocom', SSH.getBefore())
-			if result is None:
-				count = 10
-			else:
-				time.sleep(5)
-				count = count + 1
-		SSH.close()
-
-	def InitializeCatM(self,HTML):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		SSH = sshconnection.SSHConnection()
-		SSH.enablePicocomClosure()
-		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-		# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
-		SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
-		SSH.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
-		time.sleep(1)
-		# Calling twice AT to clear all buffers
-		SSH.command('AT', 'OK|ERROR', 5)
-		SSH.command('AT', 'OK', 5)
-		# Doing a power cycle
-		SSH.command('AT^RESET', 'SIMSTORE,READY', 15)
-		SSH.command('AT', 'OK|ERROR', 5)
-		SSH.command('AT', 'OK', 5)
-		SSH.command('ATE1', 'OK', 5)
-		# Disabling the Radio
-		SSH.command('AT+CFUN=0', 'OK', 5)
-		logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
-		# Checking if auto-attach is enabled
-		SSH.command('AT^AUTOATT?', 'OK', 5)
-		result = re.search('AUTOATT: (?P<state>[0-9\-]+)', SSH.getBefore())
-		if result is not None:
-			if result.group('state') is not None:
-				autoAttachState = int(result.group('state'))
-				if autoAttachState is not None:
-					if autoAttachState == 0:
-						SSH.command('AT^AUTOATT=1', 'OK', 5)
-					logging.debug('\u001B[1m Auto-Attach enabled\u001B[0m')
+	def AttachUE(self, HTML, RAN, EPC, CONTAINERS):
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		with concurrent.futures.ThreadPoolExecutor() as executor:
+			futures = [executor.submit(ue.attach) for ue in ues]
+			attached = [f.result() for f in futures]
+			futures = [executor.submit(ue.checkMTU) for ue in ues]
+			mtus = [f.result() for f in futures]
+			messages = [f"UE {ue.getName()}: {ue.getIP()}" for ue in ues]
+		if all(attached) and all(mtus):
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 		else:
-			logging.debug('\u001B[1;37;41m Could not check Auto-Attach! \u001B[0m')
-		# Force closure of picocom but device might still be locked
-		SSH.close()
-		SSH.disablePicocomClosure()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		self.checkDevTTYisUnlocked()
+			logging.error(f'error attaching or wrong MTU: attached {attached}, mtus {mtus}')
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not retrieve UE IP address(es) or MTU(s) wrong!"])
+			self.AutoTerminateUEandeNB(HTML, RAN, EPC, CONTAINERS)
 
-	def TerminateCatM(self,HTML):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		SSH = sshconnection.SSHConnection()
-		SSH.enablePicocomClosure()
-		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-		# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
-		SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
-		SSH.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
-		time.sleep(1)
-		# Calling twice AT to clear all buffers
-		SSH.command('AT', 'OK|ERROR', 5)
-		SSH.command('AT', 'OK', 5)
-		# Disabling the Radio
-		SSH.command('AT+CFUN=0', 'OK', 5)
-		logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
-		SSH.close()
-		SSH.disablePicocomClosure()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		self.checkDevTTYisUnlocked()
+	def DetachUE(self, HTML):
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		with concurrent.futures.ThreadPoolExecutor() as executor:
+			futures = [executor.submit(ue.detach) for ue in ues]
+			[f.result() for f in futures]
+			messages = [f"UE {ue.getName()}: detached" for ue in ues]
+		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 
-	def AttachCatM(self,HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		SSH = sshconnection.SSHConnection()
-		SSH.enablePicocomClosure()
-		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-		# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
-		SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
-		SSH.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
-		time.sleep(1)
-		# Calling twice AT to clear all buffers
-		SSH.command('AT', 'OK|ERROR', 5)
-		SSH.command('AT', 'OK', 5)
-		# Enabling the Radio
-		SSH.command('AT+CFUN=1', 'SIMSTORE,READY', 5)
-		logging.debug('\u001B[1m Cellular Functionality enabled\u001B[0m')
-		time.sleep(4)
-		# We should check if we register
-		count = 0
-		attach_cnt = 0
-		attach_status = False
-		while count < 5:
-			SSH.command('AT+CEREG?', 'OK', 5)
-			result = re.search('CEREG: 2,(?P<state>[0-9\-]+),', SSH.getBefore())
-			if result is not None:
-				mDataConnectionState = int(result.group('state'))
-				if mDataConnectionState is not None:
-					if mDataConnectionState == 1:
-						count = 10
-						attach_status = True
-						result = re.search('CEREG: 2,1,"(?P<networky>[0-9A-Z]+)","(?P<networkz>[0-9A-Z]+)"', SSH.getBefore())
-						if result is not None:
-							networky = result.group('networky')
-							networkz = result.group('networkz')
-							logging.debug('\u001B[1m CAT-M module attached to eNB (' + str(networky) + '/' + str(networkz) + ')\u001B[0m')
-						else:
-							logging.debug('\u001B[1m CAT-M module attached to eNB\u001B[0m')
-					else:
-						logging.debug('+CEREG: 2,' + str(mDataConnectionState))
-						attach_cnt = attach_cnt + 1
-			else:
-				logging.debug(SSH.getBefore())
-				attach_cnt = attach_cnt + 1
-			count = count + 1
-			time.sleep(1)
-		if attach_status:
-			SSH.command('AT+CESQ', 'OK', 5)
-			result = re.search('CESQ: 99,99,255,255,(?P<rsrq>[0-9]+),(?P<rsrp>[0-9]+)', SSH.getBefore())
-			if result is not None:
-				nRSRQ = int(result.group('rsrq'))
-				nRSRP = int(result.group('rsrp'))
-				if (nRSRQ is not None) and (nRSRP is not None):
-					logging.debug('    RSRQ = ' + str(-20+(nRSRQ/2)) + ' dB')
-					logging.debug('    RSRP = ' + str(-140+nRSRP) + ' dBm')
-		SSH.close()
-		SSH.disablePicocomClosure()
-		html_queue = SimpleQueue()
-		self.checkDevTTYisUnlocked()
-		if attach_status:
-			html_cell = '<pre style="background-color:white">CAT-M module Attachment Completed in ' + str(attach_cnt+4) + ' seconds'
-			if (nRSRQ is not None) and (nRSRP is not None):
-				html_cell += '\n   RSRQ = ' + str(-20+(nRSRQ/2)) + ' dB'
-				html_cell += '\n   RSRP = ' + str(-140+nRSRP) + ' dBm</pre>'
-			else:
-				html_cell += '</pre>'
-			html_queue.put(html_cell)
-			HTML.CreateHtmlTestRowQueue('N/A', 'OK', 1, html_queue)
+	def DataDisableUE(self, HTML):
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		with concurrent.futures.ThreadPoolExecutor() as executor:
+			futures = [executor.submit(ue.dataDisable) for ue in ues]
+			status = [f.result() for f in futures]
+		if all(status):
+			messages = [f"UE {ue.getName()}: data disabled" for ue in ues]
+			HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		else:
-			logging.error('\u001B[1m CAT-M module Attachment Failed\u001B[0m')
-			html_cell = '<pre style="background-color:white">CAT-M module Attachment Failed</pre>'
-			html_queue.put(html_cell)
-			HTML.CreateHtmlTestRowQueue('N/A', 'KO', 1, html_queue)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+			logging.error(f'error enabling data: {status}')
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not disable UE data!"])
 
-	def PingCatM(self,HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS):
-		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		check_eNB = True
-		check_OAI_UE = False
-		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-		if (pStatus < 0):
-			HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-			return
-		try:
-			statusQueue = SimpleQueue()
-			lock = Lock()
-			SSH = sshconnection.SSHConnection()
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
-			SSH.command('cd scripts', '\$', 5)
-			if re.match('OAI', EPC.Type, re.IGNORECASE):
-				logging.debug('Using the OAI EPC HSS: not implemented yet')
-				HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-				HTML.CreateHtmlTabFooter(False)
-				self.ConditionalExit()
-			else:
-				SSH.command('egrep --color=never "Allocated ipv4 addr" /opt/ltebox/var/log/xGwLog.0', '\$', 5)
-				result = re.search('Allocated ipv4 addr: (?P<ipaddr>[0-9\.]+) from Pool', SSH.getBefore())
-				if result is not None:
-					moduleIPAddr = result.group('ipaddr')
-				else:
-					HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-					self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-					return
-			ping_time = re.findall("-c (\d+)",str(self.ping_args))
-			device_id = 'catm'
-			ping_status = SSH.command('stdbuf -o0 ping ' + self.ping_args + ' ' + str(moduleIPAddr) + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
-			# TIMEOUT CASE
-			if ping_status < 0:
-				message = 'Ping with UE (' + str(moduleIPAddr) + ') crashed due to TIMEOUT!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				SSH.close()
-				self.ping_iperf_wrong_exit(lock, moduleIPAddr, device_id, statusQueue, message)
-				return
-			result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', SSH.getBefore())
-			if result is None:
-				message = 'Packet Loss Not Found!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				SSH.close()
-				self.ping_iperf_wrong_exit(lock, moduleIPAddr, device_id, statusQueue, message)
-				return
-			packetloss = result.group('packetloss')
-			if float(packetloss) == 100:
-				message = 'Packet Loss is 100%'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				SSH.close()
-				self.ping_iperf_wrong_exit(lock, moduleIPAddr, device_id, statusQueue, message)
-				return
-			result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', SSH.getBefore())
-			if result is None:
-				message = 'Ping RTT_Min RTT_Avg RTT_Max Not Found!'
-				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				SSH.close()
-				self.ping_iperf_wrong_exit(lock, moduleIPAddr, device_id, statusQueue, message)
-				return
-			rtt_min = result.group('rtt_min')
-			rtt_avg = result.group('rtt_avg')
-			rtt_max = result.group('rtt_max')
-			pal_msg = 'Packet Loss : ' + packetloss + '%'
-			min_msg = 'RTT(Min)    : ' + rtt_min + ' ms'
-			avg_msg = 'RTT(Avg)    : ' + rtt_avg + ' ms'
-			max_msg = 'RTT(Max)    : ' + rtt_max + ' ms'
-			lock.acquire()
-			logging.debug('\u001B[1;37;44m ping result (' + moduleIPAddr + ') \u001B[0m')
-			logging.debug('\u001B[1;34m    ' + pal_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + min_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + avg_msg + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + max_msg + '\u001B[0m')
-			qMsg = pal_msg + '\n' + min_msg + '\n' + avg_msg + '\n' + max_msg
-			packetLossOK = True
-			if packetloss is not None:
-				if float(packetloss) > float(self.ping_packetloss_threshold):
-					qMsg += '\nPacket Loss too high'
-					logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
-					packetLossOK = False
-				elif float(packetloss) > 0:
-					qMsg += '\nPacket Loss is not 0%'
-					logging.debug('\u001B[1;30;43m Packet Loss is not 0% \u001B[0m')
-			lock.release()
-			SSH.close()
-			html_cell = '<pre style="background-color:white">CAT-M module\nIP Address  : ' + moduleIPAddr + '\n' + qMsg + '</pre>'
-			statusQueue.put(html_cell)
-			if (packetLossOK):
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', 1, statusQueue)
-			else:
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', 1, statusQueue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def AttachUE_common(self, device_id, statusQueue, lock, idx,COTS_UE):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			if self.ADBCentralized:
-				#RH quick add on to integrate cots control defined by yaml
-				#if device Id exists in yaml dictionary, we execute the new procedure defined in cots_ue class
-				#otherwise we use the legacy procedure 
-				if COTS_UE.Check_Exists(device_id):
-					#switch device to Airplane mode OFF (ie Radio ON)
-					COTS_UE.Set_Airplane(device_id, 'OFF')
-				elif device_id == '84B7N16418004022':
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/on"', '\$', 60)
-				else:
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/on', '\$', 60)
-			else:
-				# airplane mode off // radio on
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
-			time.sleep(2)
-			max_count = 45
-			count = max_count
-			while count > 0:
-				if self.ADBCentralized:
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "dumpsys telephony.registry" | grep -m 1 mDataConnectionState', '\$', 15)
-				else:
-					SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "dumpsys telephony.registry"\' | grep -m 1 mDataConnectionState', '\$', 60)
-				result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', SSH.getBefore())
-				if result is None:
-					logging.debug('\u001B[1;37;41m mDataConnectionState Not Found! \u001B[0m')
-					lock.acquire()
-					statusQueue.put(-1)
-					statusQueue.put(device_id)
-					statusQueue.put('mDataConnectionState Not Found!')
-					lock.release()
-					break
-				mDataConnectionState = int(result.group('state'))
-				if mDataConnectionState == 2:
-					logging.debug('\u001B[1mUE (' + device_id + ') Attach Completed\u001B[0m')
-					lock.acquire()
-					statusQueue.put(max_count - count)
-					statusQueue.put(device_id)
-					statusQueue.put('Attach Completed')
-					lock.release()
-					break
-				count = count - 1
-				if count == 15 or count == 30:
-					logging.debug('\u001B[1;30;43m Retry UE (' + device_id + ') Flight Mode Off \u001B[0m')
-					if self.ADBCentralized:
-					#RH quick add on to intgrate cots control defined by yaml
-					#if device id exists in yaml dictionary, we execute the new procedure defined in cots_ue class
-					#otherwise we use the legacy procedure
-						if COTS_UE.Check_Exists(device_id):
-							#switch device to Airplane mode ON  (ie Radio OFF)
-							COTS_UE.Set_Airplane(device_id, 'ON')
-						elif device_id == '84B7N16418004022':
-							SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
-						else:
-							SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
-					else:
-						SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
-					time.sleep(0.5)
-					if self.ADBCentralized:
-					#RH quick add on to integrate cots control defined by yaml
-					#if device id exists in yaml dictionary, we execute the new procedre defined incots_ue class
-					#otherwise we use the legacy procedure
-						if COTS_UE.Check_Exists(device_id):
-							#switch device to Airplane mode OFF (ie Radio ON)
-							COTS_UE.Set_Airplane(device_id, 'OFF')
-						elif device_id == '84B7N16418004022':
-							SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/on"', '\$', 60)
-						else:
-							SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/on', '\$', 60)
-					else:
-						SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
-					time.sleep(0.5)
-				logging.debug('\u001B[1mWait UE (' + device_id + ') a second until mDataConnectionState=2 (' + str(max_count-count) + ' times)\u001B[0m')
-				time.sleep(1)
-			if count == 0:
-				logging.debug('\u001B[1;37;41m UE (' + device_id + ') Attach Failed \u001B[0m')
-				lock.acquire()
-				statusQueue.put(-1)
-				statusQueue.put(device_id)
-				statusQueue.put('Attach Failed')
-				lock.release()
-			SSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def AttachUE(self,HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS):
-		if self.ue_id=='':#no ID specified, then it is a COTS controlled by ADB
-			if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-				HELP.GenericHelp(CONST.Version)
-				sys.exit('Insufficient Parameter')
-			check_eNB = True
-			check_OAI_UE = False
-			pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-			if (pStatus < 0):
-				HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				return
-			multi_jobs = []
-			status_queue = SimpleQueue()
-			lock = Lock()
-			nb_ue_to_connect = 0
-			for device_id in self.UEDevices:
-				if (self.nbMaxUEtoAttach == -1) or (nb_ue_to_connect < self.nbMaxUEtoAttach):
-					self.UEDevicesStatus[nb_ue_to_connect] = CONST.UE_STATUS_ATTACHING
-					p = Process(target = self.AttachUE_common, args = (device_id, status_queue, lock,nb_ue_to_connect,COTS_UE,))
-					p.daemon = True
-					p.start()
-					multi_jobs.append(p)
-				nb_ue_to_connect = nb_ue_to_connect + 1
-			for job in multi_jobs:
-				job.join()
-
-			if (status_queue.empty()):
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				return
-			else:
-				attach_status = True
-				html_queue = SimpleQueue()
-				while (not status_queue.empty()):
-					count = status_queue.get()
-					if (count < 0):
-						attach_status = False
-					device_id = status_queue.get()
-					message = status_queue.get()
-					if (count < 0):
-						html_cell = '<pre style="background-color:white">UE (' + device_id + ')\n' + message + '</pre>'
-					else:
-						html_cell = '<pre style="background-color:white">UE (' + device_id + ')\n' + message + ' in ' + str(count + 2) + ' seconds</pre>'
-					html_queue.put(html_cell)
-				if (attach_status):
-					cnt = 0
-					while cnt < len(self.UEDevices):
-						if self.UEDevicesStatus[cnt] == CONST.UE_STATUS_ATTACHING:
-							self.UEDevicesStatus[cnt] = CONST.UE_STATUS_ATTACHED
-						cnt += 1
-					HTML.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
-					result = re.search('T_stdout', str(RAN.Initialize_eNB_args))
-					if result is not None:
-						logging.debug('Waiting 5 seconds to fill up record file')
-						time.sleep(5)
-				else:
-					HTML.CreateHtmlTestRowQueue('N/A', 'KO', len(self.UEDevices), html_queue)
-					self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-
-		else: #if an ID is specified, it is a module from the yaml infrastructure file
-			#Attention, as opposed to InitializeUE, the connect manager process is not checked as it is supposed to be active already
-			#only 1- module wakeup, 2- check IP address
-			Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id])
-			status = -1
-			cnt = 0
-			while cnt < 4:
-				Module_UE.Command("wup")
-				logging.debug("Waiting for IP address to be assigned")
-				time.sleep(5)
-				logging.debug("Retrieve IP address")
-				status=Module_UE.GetModuleIPAddress()
-				if status==0:
-					cnt = 10
-				else:
-					cnt += 1
-					Module_UE.Command("detach")
-					time.sleep(20)
-
-			if cnt == 10 and status == 0:
-				HTML.CreateHtmlTestRow(Module_UE.UEIPAddress, 'OK', CONST.ALL_PROCESSES_OK)	
-				logging.debug('UE IP addresss : '+ Module_UE.UEIPAddress)
-				#execute additional commands from yaml file after UE attach
-				SSH = sshconnection.SSHConnection()
-				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-				if hasattr(Module_UE,'StartCommands'):
-					for startcommand in Module_UE.StartCommands:
-						cmd = 'echo ' + Module_UE.HostPassword + ' | ' + startcommand
-						SSH.command(cmd,'\$',5)
-				SSH.close()
-				#check that the MTU is as expected / requested
-				Module_UE.CheckModuleMTU()
-			else: #status==-1 failed to retrieve IP address
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.UE_IP_ADDRESS_ISSUE)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				return					
-
-	def DetachUE_common(self, device_id, idx,COTS_UE):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			if self.ADBCentralized:
-				#RH quick add on to  integrate cots control defined by yaml
-				#if device id exists in yaml dictionary, we execute the new procedure defined in cots_ue class
-				#otherwise we use the legacy procedure
-				if COTS_UE.Check_Exists(device_id):
-					#switch device to Airplane mode ON (ie Radio OFF)
-					COTS_UE.Set_Airplane(device_id,'ON')
-				elif device_id == '84B7N16418004022':
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
-				else:
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
-			else:
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
-			logging.debug('\u001B[1mUE (' + device_id + ') Detach Completed\u001B[0m')
-			SSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def DetachUE(self,HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS):
-		if self.ue_id=='':#no ID specified, then it is a COTS controlled by ADB
-			if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-				HELP.GenericHelp(CONST.Version)
-				sys.exit('Insufficient Parameter')
-			check_eNB = True
-			check_OAI_UE = False
-			pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-			if (pStatus < 0):
-				HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				return
-			multi_jobs = []
-			cnt = 0
-			for device_id in self.UEDevices:
-				self.UEDevicesStatus[cnt] = CONST.UE_STATUS_DETACHING
-				p = Process(target = self.DetachUE_common, args = (device_id,cnt,COTS_UE,))
-				p.daemon = True
-				p.start()
-				multi_jobs.append(p)
-				cnt += 1
-			for job in multi_jobs:
-				job.join()
-			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-			result = re.search('T_stdout', str(RAN.Initialize_eNB_args))
-			if result is not None:
-				logging.debug('Waiting 5 seconds to fill up record file')
-				time.sleep(5)
-			cnt = 0
-			while cnt < len(self.UEDevices):
-				self.UEDevicesStatus[cnt] = CONST.UE_STATUS_DETACHED
-				cnt += 1
-		else:#if an ID is specified, it is a module from the yaml infrastructure file
-			Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id])
-			Module_UE.Command("detach")
-			HTML.CreateHtmlTestRow('NA', 'OK', CONST.ALL_PROCESSES_OK)	
-				
-							
-
-	def RebootUE_common(self, device_id):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			previousmDataConnectionStates = []
-			# Save mDataConnectionState
-			SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
-			SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
-			result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', SSH.getBefore())
-			if result is None:
-				logging.debug('\u001B[1;37;41m mDataConnectionState Not Found! \u001B[0m')
-				sys.exit(1)
-			previousmDataConnectionStates.append(int(result.group('state')))
-			# Reboot UE
-			SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell reboot', '\$', 10)
-			time.sleep(60)
-			previousmDataConnectionState = previousmDataConnectionStates.pop(0)
-			count = 180
-			while count > 0:
-				count = count - 1
-				SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
-				result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', SSH.getBefore())
-				if result is None:
-					mDataConnectionState = None
-				else:
-					mDataConnectionState = int(result.group('state'))
-					logging.debug('mDataConnectionState = ' + result.group('state'))
-				if mDataConnectionState is None or (previousmDataConnectionState == 2 and mDataConnectionState != 2):
-					logging.debug('\u001B[1mWait UE (' + device_id + ') a second until reboot completion (' + str(180-count) + ' times)\u001B[0m')
-					time.sleep(1)
-				else:
-					logging.debug('\u001B[1mUE (' + device_id + ') Reboot Completed\u001B[0m')
-					break
-			if count == 0:
-				logging.debug('\u001B[1;37;41m UE (' + device_id + ') Reboot Failed \u001B[0m')
-				sys.exit(1)
-			SSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def RebootUE(self,HTML,RAN,EPC):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		check_eNB = True
-		check_OAI_UE = False
-		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-		if (pStatus < 0):
-			HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
-			HTML.CreateHtmlTabFooter(False)
-			self.ConditionalExit()
-		multi_jobs = []
-		for device_id in self.UEDevices:
-			p = Process(target = self.RebootUE_common, args = (device_id,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-		for job in multi_jobs:
-			job.join()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-
-	def DataDisableUE_common(self, device_id, idx):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			# disable data service
-			if self.ADBCentralized:
-				SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data disable"', '\$', 60)
-			else:
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data disable"\'', '\$', 60)
-			logging.debug('\u001B[1mUE (' + device_id + ') Disabled Data Service\u001B[0m')
-			SSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def DataDisableUE(self,HTML):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		multi_jobs = []
-		i = 0
-		for device_id in self.UEDevices:
-			p = Process(target = self.DataDisableUE_common, args = (device_id,i,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-			i += 1
-		for job in multi_jobs:
-			job.join()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-
-	def DataEnableUE_common(self, device_id, idx):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			# enable data service
-			if self.ADBCentralized:
-				SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data enable"', '\$', 60)
-			else:
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
-			logging.debug('\u001B[1mUE (' + device_id + ') Enabled Data Service\u001B[0m')
-			SSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def DataEnableUE(self,HTML):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		multi_jobs = []
-		i = 0
-		for device_id in self.UEDevices:
-			p = Process(target = self.DataEnableUE_common, args = (device_id,i,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-			i += 1
-		for job in multi_jobs:
-			job.join()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-
-	def GetAllUEDevices(self, terminate_ue_flag):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		SSH = sshconnection.SSHConnection()
-		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-		if self.ADBCentralized:
-			SSH.command('adb devices', '\$', 15)
-			self.UEDevices = re.findall('\r\n([A-Za-z0-9]+)\tdevice',SSH.getBefore())
-			#report number and id of devices found
-			msg = "UEDevices found by GetAllUEDevices : " + " ".join(self.UEDevices)
-			logging.debug(msg)
-			SSH.close()
+	def DataEnableUE(self, HTML):
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		logging.debug(f'disabling data for UEs {ues}')
+		with concurrent.futures.ThreadPoolExecutor() as executor:
+			futures = [executor.submit(ue.dataEnable) for ue in ues]
+			status = [f.result() for f in futures]
+		if all(status):
+			messages = [f"UE {ue.getName()}: data enabled" for ue in ues]
+			HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		else:
-			if (os.path.isfile('./phones_list.txt')):
-				os.remove('./phones_list.txt')
-			SSH.command('ls /etc/*/phones*.txt', '\$', 5)
-			result = re.search('/etc/ci/phones_list.txt', SSH.getBefore())
-			SSH.close()
-			if (result is not None) and (len(self.UEDevices) == 0):
-				SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, '/etc/ci/phones_list.txt', '.')
-				if (os.path.isfile('./phones_list.txt')):
-					phone_list_file = open('./phones_list.txt', 'r')
-					for line in phone_list_file.readlines():
-						line = line.strip()
-						result = re.search('^#', line)
-						if result is not None:
-							continue
-						comma_split = line.split(",")
-						self.UEDevices.append(comma_split[0])
-						self.UEDevicesRemoteServer.append(comma_split[1])
-						self.UEDevicesRemoteUser.append(comma_split[2])
-						self.UEDevicesOffCmd.append(comma_split[3])
-						self.UEDevicesOnCmd.append(comma_split[4])
-						self.UEDevicesRebootCmd.append(comma_split[5])
-					phone_list_file.close()
+			logging.error(f'error enabling data: {status}')
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not enable UE data!"])
 
-		# better handling of the case when no UE detected
-		# Sys-exit is now dealt by the calling function
-		if terminate_ue_flag == True:
-			if len(self.UEDevices) == 0:
-				logging.debug('\u001B[1;37;41m UE Not Found! \u001B[0m')
-				return False
-		if len(self.UEDevicesStatus) == 0:
-			cnt = 0
-			while cnt < len(self.UEDevices):
-				self.UEDevicesStatus.append(CONST.UE_STATUS_DETACHED)
-				cnt += 1
-		return True
-
-	def GetAllCatMDevices(self, terminate_ue_flag):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		SSH = sshconnection.SSHConnection()
-		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-		if self.ADBCentralized:
-			SSH.command('lsusb | egrep --colour=never "Future Technology Devices International, Ltd FT2232C" | sed -e "s#:.*##" -e "s# #_#g"', '\$', 15)
-			self.CatMDevices = re.findall('\r\n([A-Za-z0-9_]+)',SSH.getBefore())
-		else:
-			if (os.path.isfile('./modules_list.txt')):
-				os.remove('./modules_list.txt')
-			SSH.command('ls /etc/*/modules*.txt', '\$', 5)
-			result = re.search('/etc/ci/modules_list.txt', SSH.getBefore())
-			SSH.close()
-			if result is not None:
-				logging.debug('Found a module list file on ADB server')
-		if terminate_ue_flag == True:
-			if len(self.CatMDevices) == 0:
-				logging.debug('\u001B[1;37;41m CAT-M UE Not Found! \u001B[0m')
-				sys.exit(1)
-		SSH.close()
-
-	def CheckUEStatus_common(self, lock, device_id, statusQueue, idx):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			if self.ADBCentralized:
-				SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "dumpsys telephony.registry"', '\$', 15)
-			else:
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "dumpsys telephony.registry"\'', '\$', 60)
-			result = re.search('mServiceState=(?P<serviceState>[0-9]+)', SSH.getBefore())
-			serviceState = 'Service State: UNKNOWN'
-			if result is not None:
-				lServiceState = int(result.group('serviceState'))
-				if lServiceState == 3:
-					serviceState = 'Service State: RADIO_POWERED_OFF'
-				if lServiceState == 1:
-					serviceState = 'Service State: OUT_OF_SERVICE'
-				if lServiceState == 0:
-					serviceState = 'Service State: IN_SERVICE'
-				if lServiceState == 2:
-					serviceState = 'Service State: EMERGENCY_ONLY'
-			result = re.search('mDataConnectionState=(?P<dataConnectionState>[0-9]+)', SSH.getBefore())
-			dataConnectionState = 'Data State:    UNKNOWN'
-			if result is not None:
-				lDataConnectionState = int(result.group('dataConnectionState'))
-				if lDataConnectionState == 0:
-					dataConnectionState = 'Data State:    DISCONNECTED'
-				if lDataConnectionState == 1:
-					dataConnectionState = 'Data State:    CONNECTING'
-				if lDataConnectionState == 2:
-					dataConnectionState = 'Data State:    CONNECTED'
-				if lDataConnectionState == 3:
-					dataConnectionState = 'Data State:    SUSPENDED'
-			result = re.search('mDataConnectionReason=(?P<dataConnectionReason>[0-9a-zA-Z_]+)', SSH.getBefore())
-			time.sleep(1)
-			SSH.close()
-			dataConnectionReason = 'Data Reason:   UNKNOWN'
-			if result is not None:
-				dataConnectionReason = 'Data Reason:   ' + result.group('dataConnectionReason')
-			lock.acquire()
-			logging.debug('\u001B[1;37;44m Status Check (' + str(device_id) + ') \u001B[0m')
-			logging.debug('\u001B[1;34m    ' + serviceState + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + dataConnectionState + '\u001B[0m')
-			logging.debug('\u001B[1;34m    ' + dataConnectionReason + '\u001B[0m')
-			statusQueue.put(0)
-			statusQueue.put(device_id)
-			qMsg = serviceState + '\n' + dataConnectionState + '\n' + dataConnectionReason
-			statusQueue.put(qMsg)
-			lock.release()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def CheckStatusUE(self,HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS):
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		check_eNB = True
-		check_OAI_UE = False
-		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-		if (pStatus < 0):
-			HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
-			HTML.CreateHtmlTabFooter(False)
-			self.ConditionalExit()
-		multi_jobs = []
-		lock = Lock()
-		status_queue = SimpleQueue()
-		i = 0
-		for device_id in self.UEDevices:
-			p = Process(target = self.CheckUEStatus_common, args = (lock,device_id,status_queue,i,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-			i += 1
-		for job in multi_jobs:
-			job.join()
-		passStatus = True
-		htmlOptions = 'N/A'
-
-		if (status_queue.empty()):
-			HTML.CreateHtmlTestRow(htmlOptions, 'KO', CONST.ALL_PROCESSES_OK)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-		else:
-			check_status = True
-			html_queue = SimpleQueue()
-			while (not status_queue.empty()):
-				count = status_queue.get()
-				if (count < 0):
-					check_status = False
-				device_id = status_queue.get()
-				message = status_queue.get()
-				html_cell = '<pre style="background-color:white">UE (' + device_id + ')\n' + message + '</pre>'
-				html_queue.put(html_cell)
-			if check_status and passStatus:
-				HTML.CreateHtmlTestRowQueue(htmlOptions, 'OK', len(self.UEDevices), html_queue)
-			else:
-				HTML.CreateHtmlTestRowQueue(htmlOptions, 'KO', len(self.UEDevices), html_queue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-
-	def GetAllUEIPAddresses(self):
-		SSH = sshconnection.SSHConnection()
-		if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		ue_ip_status = 0
-		self.UEIPAddresses = []
-		if (len(self.UEDevices) == 1) and (self.UEDevices[0] == 'OAI-UE'):
-			if self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '' or self.UESourceCodePath == '':
-				HELP.GenericHelp(CONST.Version)
-				sys.exit('Insufficient Parameter')
-
-			SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-			SSH.command('ifconfig oaitun_ue1', '\$', 4)
-			result = re.search('inet addr:(?P<ueipaddress>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)|inet (?P<ueipaddress2>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', SSH.getBefore())
-			if result is not None:
-				if result.group('ueipaddress') is not None:
-					UE_IPAddress = result.group('ueipaddress')
-				else:
-					UE_IPAddress = result.group('ueipaddress2')
-				logging.debug('\u001B[1mUE (' + self.UEDevices[0] + ') IP Address is ' + UE_IPAddress + '\u001B[0m')
-				self.UEIPAddresses.append(UE_IPAddress)
-			else:
-				logging.debug('\u001B[1;37;41m UE IP Address Not Found! \u001B[0m')
-				ue_ip_status -= 1
-			SSH.close()
-			return ue_ip_status
-		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-		idx = 0
-		for device_id in self.UEDevices:
-			if self.UEDevicesStatus[idx] != CONST.UE_STATUS_ATTACHED:
-				idx += 1
-				continue
-			count = 0
-			while count < 4:
-				if self.ADBCentralized:
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "ip addr show | grep rmnet"', '\$', 15)
-				else:
-					SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ip addr show | grep rmnet"\'', '\$', 60)
-				result = re.search('inet (?P<ueipaddress>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/[0-9]+[0-9a-zA-Z\.\s]+', SSH.getBefore())
-				if result is None:
-					logging.debug('\u001B[1;37;41m UE IP Address Not Found! \u001B[0m')
-					time.sleep(1)
-					count += 1
-				else:
-					count = 10
-			if count < 9:
-				ue_ip_status -= 1
-				continue
-			UE_IPAddress = result.group('ueipaddress')
-			logging.debug('\u001B[1mUE (' + device_id + ') IP Address is ' + UE_IPAddress + '\u001B[0m')
-			for ueipaddress in self.UEIPAddresses:
-				if ueipaddress == UE_IPAddress:
-					logging.debug('\u001B[1mUE (' + device_id + ') IP Address ' + UE_IPAddress + ': has already been allocated to another device !' + '\u001B[0m')
-					ue_ip_status -= 1
-					continue
-			self.UEIPAddresses.append(UE_IPAddress)
-			idx += 1
-		SSH.close()
-		return ue_ip_status
+	def CheckStatusUE(self,HTML):
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		logging.debug(f'checking status of UEs {ues}')
+		messages = []
+		with concurrent.futures.ThreadPoolExecutor() as executor:
+			futures = [executor.submit(ue.check) for ue in ues]
+			messages = [f.result() for f in futures]
+		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 
 	def ping_iperf_wrong_exit(self, lock, UE_IPAddress, device_id, statusQueue, message):
+		logging.error(f"ue {device_id} {UE_IPAddress}: {message}")
 		lock.acquire()
 		statusQueue.put(-1)
 		statusQueue.put(device_id)
@@ -1502,30 +573,18 @@ class OaiCiTest():
 		statusQueue.put(message)
 		lock.release()
 
-	def Ping_common(self, lock, UE_IPAddress, device_id, statusQueue,EPC, Module_UE,RAN):
+	def Ping_common(self, lock, statusQueue,EPC, ue, RAN):
 		try:
-			SSH = sshconnection.SSHConnection()
 			# Launch ping on the EPC side (true for ltebox and old open-air-cn)
 			# But for OAI-Rel14-CUPS, we launch from python executor
 			ping_status = 0
-			launchFromEpc = True
-			launchFromModule = False
-			launchFromASUE = False
+			launchFromEpc = False
+			ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log'
 			if re.match('OAI-Rel14-CUPS', EPC.Type, re.IGNORECASE):
 				launchFromEpc = False
-			#if module, ping from module to EPC
-			if self.ue_id!='':
-				if (re.match('amarisoft', self.ue_id, re.IGNORECASE)):
-					launchFromEpc = False
-					launchFromASUE = True
-				else:
-					launchFromEpc = False
-					launchFromModule = True
-			#no ping args for ASUE
-			if self.ping_args!='':
-				ping_time = re.findall("-c (\d+)",str(self.ping_args))
-
+			ping_time = re.findall("-c *(\d+)",str(self.ping_args))
 			if launchFromEpc:
+				SSH = sshconnection.SSHConnection()
 				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 				SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
 				SSH.command('cd scripts', '\$', 5)
@@ -1534,93 +593,59 @@ class OaiCiTest():
 				if (re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE)) or (re.match('OAICN5G', EPC.Type, re.IGNORECASE)):
 					launchFromTrfContainer = True
 				if launchFromTrfContainer:
-					ping_status = SSH.command('docker exec -it prod-trf-gen /bin/bash -c "ping ' + self.ping_args + ' ' + UE_IPAddress + '" 2>&1 | tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)				
+					ping_status = SSH.command(f'docker exec -it prod-trf-gen /bin/bash -c "ping {self.ping_args} {ue.getIP()}" 2>&1 | tee {ping_log_file}', '\$', int(ping_time[0])*1.5)
 				else:
-					ping_status = SSH.command('stdbuf -o0 ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
-				ping_log_file='ping_' + self.testCase_id + '_' + device_id + '.log'
+					ping_status = SSH.command(f'stdbuf -o0 ping {self.ping_args} {ue.getIP()} 2>&1 | stdbuf -o0 tee {ping_log_file}', '\$', int(ping_time[0])*1.5)
 				#copy the ping log file to have it locally for analysis (ping stats)
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '.')				
+				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/{ping_log_file}', '.')				
+				SSH.close()
 			else:
-				if (launchFromModule == False) and (launchFromASUE == False):
-					#ping log file is on the python executor
-					cmd = 'ping ' + self.ping_args + ' ' + UE_IPAddress + ' > ping_' + self.testCase_id + '_' + device_id + '.log 2>&1'
-					message = cmd + '\n'
-					logging.debug(cmd)
-					ret = subprocess.run(cmd, shell=True)
-					ping_status = ret.returncode
-					#copy the ping log file to an other folder for log collection (source and desti				elif (launchfromModule == True) and (launchfromASUE == False): #launch from Modulenation are EPC)
-					SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'ping_' + self.testCase_id + '_' + device_id + '.log', EPC.SourceCodePath + '/scripts')
-                	#copy the ping log file to have it locally for analysis (ping stats)
-					logging.debug(EPC.SourceCodePath + 'ping_' + self.testCase_id + '_' + device_id + '.log')
-					SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath  +'/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '.')
-
-					SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-					#cat is executed on EPC
-					SSH.command('cat ' + EPC.SourceCodePath + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-					ping_log_file='/scripts/ping_' + self.testCase_id + '_' + device_id + '.log'
-
-				elif (launchFromModule == True) and (launchFromASUE == False): #launch from Module
-					SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-					#target address is different depending on EPC type
-					if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
-						Target = EPC.MmeIPAddress
-					elif re.match('OAICN5G', EPC.Type, re.IGNORECASE):
-						Target = EPC.MmeIPAddress
-					else:
-						Target = EPC.IPAddress
-					#ping from module NIC rather than IP address to make sure round trip is over the air	
-					cmd = 'ping -I ' + Module_UE.UENetwork  + ' ' + self.ping_args + ' ' +  Target  + ' > ping_' + self.testCase_id + '_' + self.ue_id + '.log 2>&1'
-					SSH.command(cmd,'\$',int(ping_time[0])*1.5)
-
-					#copy the ping log file to have it locally for analysis (ping stats)
-					SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, 'ping_' + self.testCase_id + '_' + self.ue_id + '.log', '.')
-
-					#cat is executed locally 
-					SSH.command('cat ping_' + self.testCase_id + '_' + self.ue_id + '.log', '\$', 5)
-					ping_log_file='ping_' + self.testCase_id + '_' + self.ue_id + '.log'
-
-				elif (launchFromASUE == True): 
-					#ping was already executed when running scenario
-					#we only need to retrieve ping log file, whose location is in the ci_ueinfra.yaml
-					logging.debug("Get logs from AS server : " + Module_UE.Ping + ", " + Module_UE.UELog)
-					SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, Module_UE.Ping, '.')
-					SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, Module_UE.UELog, '.')
-					logging.debug("Ping analysis from Amarisoft scenario")
-					path,ping_log_file = os.path.split(Module_UE.Ping)
-					SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-					SSH.command('cat ' + Module_UE.Ping, '\$', 5)
-
+				#target address is different depending on EPC type
+				if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
+					Target = EPC.MmeIPAddress
+				elif re.match('OAICN5G', EPC.Type, re.IGNORECASE):
+					Target = EPC.MmeIPAddress
 				else:
-					ping_status=-1
+					Target = EPC.IPAddress
+				#ping from module NIC rather than IP address to make sure round trip is over the air	
+				interface = f'-I {ue.getIFName()}' if ue.getIFName() else ''
+				ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} {Target} &> /tmp/{ping_log_file}'
+				cmd = cls_cmd.getConnection(ue.getHost())
+				response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
+				if response.returncode != 0:
+					ping_status = -1
+				else:
+					#copy the ping log file to have it locally for analysis (ping stats)
+					cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=ping_log_file)
+
+				cmd.close()
 
 			# TIMEOUT CASE
 			if ping_status < 0:
-				message = 'Ping with UE (' + str(UE_IPAddress) + ') crashed due to TIMEOUT!'
+				message = 'Ping with UE (' + str(ue.getIP()) + ') crashed due to TIMEOUT!'
 				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				SSH.close()
-				self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
+				self.ping_iperf_wrong_exit(lock, ue.getIP(), ue.getName(), statusQueue, message)
 				return
 			#search is done on cat result
-			result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', SSH.getBefore())
+			with open(ping_log_file, 'r') as f:
+				ping_output = "".join(f.readlines())
+			result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
 			if result is None:
 				message = 'Packet Loss Not Found!'
 				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				SSH.close()
-				self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
+				self.ping_iperf_wrong_exit(lock, ue.getIP(), ue.getName(), statusQueue, message)
 				return
 			packetloss = result.group('packetloss')
 			if float(packetloss) == 100:
 				message = 'Packet Loss is 100%'
 				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				SSH.close()
-				self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
+				self.ping_iperf_wrong_exit(lock, ue.getIP(), ue.getName(), statusQueue, message)
 				return
-			result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', SSH.getBefore())
+			result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', ping_output)
 			if result is None:
 				message = 'Ping RTT_Min RTT_Avg RTT_Max Not Found!'
 				logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-				SSH.close()
-				self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
+				self.ping_iperf_wrong_exit(lock, ue.getIP(), ue.getName(), statusQueue, message)
 				return
 			rtt_min = result.group('rtt_min')
 			rtt_avg = result.group('rtt_avg')
@@ -1631,7 +656,7 @@ class OaiCiTest():
 			max_msg = 'RTT(Max)    : ' + rtt_max + ' ms'
 
 			lock.acquire()
-			logging.debug('\u001B[1;37;44m ping result (' + UE_IPAddress + ') \u001B[0m')
+			logging.debug('\u001B[1;37;44m ping result (' + ue.getIP() + ') \u001B[0m')
 			logging.debug('\u001B[1;34m    ' + pal_msg + '\u001B[0m')
 			logging.debug('\u001B[1;34m    ' + min_msg + '\u001B[0m')
 			logging.debug('\u001B[1;34m    ' + avg_msg + '\u001B[0m')
@@ -1640,22 +665,21 @@ class OaiCiTest():
 			#adding extra ping stats from local file
 			#ping_log_file variable is defined above in this function, depending on device/ue
 			ping_stat_msg=''
-			if launchFromASUE == False : #skip in case of AS UE (for the moment)
-				logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file)
-				ping_stat=GetPingTimeAnalysis(RAN,ping_log_file,self.ping_rttavg_threshold)
+			logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file)
+			ping_stat=GetPingTimeAnalysis(RAN,ping_log_file,self.ping_rttavg_threshold)
 
-				if (ping_stat!=-1) and (len(ping_stat)!=0):
-					ping_stat_msg+='Ping stats before removing largest value : \n'
-					ping_stat_msg+='RTT(Min)    : ' + str("{:.2f}".format(ping_stat['min_0'])) + 'ms \n'
-					ping_stat_msg+='RTT(Mean)   : ' + str("{:.2f}".format(ping_stat['mean_0'])) + 'ms \n'
-					ping_stat_msg+='RTT(Median) : ' + str("{:.2f}".format(ping_stat['median_0'])) + 'ms \n'
-					ping_stat_msg+='RTT(Max)    : ' + str("{:.2f}".format(ping_stat['max_0'])) + 'ms \n'
-					ping_stat_msg+='Max Index   : ' + str(ping_stat['max_loc']) + '\n'
-					ping_stat_msg+='Ping stats after removing largest value : \n'
-					ping_stat_msg+='RTT(Min)    : ' + str("{:.2f}".format(ping_stat['min_1'])) + 'ms \n'
-					ping_stat_msg+='RTT(Mean)   : ' + str("{:.2f}".format(ping_stat['mean_1'])) + 'ms \n'
-					ping_stat_msg+='RTT(Median) : ' + str("{:.2f}".format(ping_stat['median_1'])) + 'ms \n'
-					ping_stat_msg+='RTT(Max)    : ' + str("{:.2f}".format(ping_stat['max_1'])) + 'ms \n'
+			if (ping_stat!=-1) and (len(ping_stat)!=0):
+				ping_stat_msg+='Ping stats before removing largest value : \n'
+				ping_stat_msg+='RTT(Min)    : ' + str("{:.2f}".format(ping_stat['min_0'])) + 'ms \n'
+				ping_stat_msg+='RTT(Mean)   : ' + str("{:.2f}".format(ping_stat['mean_0'])) + 'ms \n'
+				ping_stat_msg+='RTT(Median) : ' + str("{:.2f}".format(ping_stat['median_0'])) + 'ms \n'
+				ping_stat_msg+='RTT(Max)    : ' + str("{:.2f}".format(ping_stat['max_0'])) + 'ms \n'
+				ping_stat_msg+='Max Index   : ' + str(ping_stat['max_loc']) + '\n'
+				ping_stat_msg+='Ping stats after removing largest value : \n'
+				ping_stat_msg+='RTT(Min)    : ' + str("{:.2f}".format(ping_stat['min_1'])) + 'ms \n'
+				ping_stat_msg+='RTT(Mean)   : ' + str("{:.2f}".format(ping_stat['mean_1'])) + 'ms \n'
+				ping_stat_msg+='RTT(Median) : ' + str("{:.2f}".format(ping_stat['median_1'])) + 'ms \n'
+				ping_stat_msg+='RTT(Max)    : ' + str("{:.2f}".format(ping_stat['max_1'])) + 'ms \n'
 
 			#building html message
 			qMsg = pal_msg + '\n' + min_msg + '\n' + avg_msg + '\n' + max_msg + '\n'  + ping_stat_msg
@@ -1684,30 +708,22 @@ class OaiCiTest():
 				statusQueue.put(0)
 			else:
 				statusQueue.put(-1)
-			statusQueue.put(device_id)
-			statusQueue.put(UE_IPAddress)
+			statusQueue.put(ue.getName())
+			statusQueue.put(ue.getIP())
 			statusQueue.put(qMsg)
 			lock.release()
-			SSH.close()
 		except:
 			logging.debug('exit from Ping_Common except')
 			os.kill(os.getppid(),signal.SIGUSR1)
 
 	def PingNoS1_wrong_exit(self, qMsg,HTML):
-		html_queue = SimpleQueue()
-		html_cell = '<pre style="background-color:white">OAI UE ping result\n' + qMsg + '</pre>'
-		html_queue.put(html_cell)
-		HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
+		message = 'OAI UE ping result\n{qMsg}'
+		HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', [message])
 
-	def PingNoS1(self,HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS):
+	def PingNoS1(self,HTML,RAN,EPC,CONTAINERS):
 		SSH=sshconnection.SSHConnection()
 		check_eNB = True
 		check_OAI_UE = True
-		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-		if (pStatus < 0):
-			HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-			return
 		ping_from_eNB = re.search('oaitun_enb1', str(self.ping_args))
 		if ping_from_eNB is not None:
 			if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '':
@@ -1773,14 +789,11 @@ class OaiCiTest():
 					qMsg += '\nPacket Loss is not 0%'
 					logging.debug('\u001B[1;30;43m Packet Loss is not 0% \u001B[0m')
 			SSH.close()
-			html_queue = SimpleQueue()
-			ip_addr = 'TBD'
-			html_cell = '<pre style="background-color:white">OAI UE ping result\n' + qMsg + '</pre>'
-			html_queue.put(html_cell)
+			message = f'OAI UE ping result\n{qMsg}'
 			if packetLossOK:
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', len(self.UEDevices), html_queue)
+				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', [message])
 			else:
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
+				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', [message])
 
 			# copying on the EPC server for logCollection
 			if ping_from_eNB is not None:
@@ -1792,10 +805,10 @@ class OaiCiTest():
 		except:
 			os.kill(os.getppid(),signal.SIGUSR1)
 
-	def Ping(self,HTML,RAN,EPC,COTS_UE, InfraUE, CONTAINERS):
+	def Ping(self,HTML,RAN,EPC,CONTAINERS):
 		result = re.search('noS1', str(RAN.Initialize_eNB_args))
 		if result is not None:
-			self.PingNoS1(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
+			self.PingNoS1(HTML,RAN,EPC,CONTAINERS)
 			return
 		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)
@@ -1805,46 +818,25 @@ class OaiCiTest():
 			check_OAI_UE = True
 		else:
 			check_OAI_UE = False
-		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-		if (pStatus < 0):
-			HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-			return
 
-		if self.ue_id=="":
-			Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra['dummy']) #RH, temporary, we need a dummy Module_UE object to pass to Ping_common
-			ueIpStatus = self.GetAllUEIPAddresses()
-			if (ueIpStatus < 0):
-				HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				return
-		else: #if an ID is specified, it is a UE from the yaml infrastructure file
-			ue_kind = InfraUE.ci_ue_infra[self.ue_id]['Kind']
-			logging.debug("Detected UE Kind : " + ue_kind)
+		if self.ue_ids == []:
+			raise Exception("no module names in self.ue_ids provided")
+		ues = []
+		for ue_id in self.ue_ids:
+			ue = cls_module_ue.Module_UE(ue_id)
+			if not ue.getIP():
+				logging.error("no IP addresses returned")
+				HTML.CreateHtmlTestRow(self.ping_args, 'KO', len(self.UEDevices), html_queue)
+				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
+			ues.append(ue)
+		logging.debug(ues)
 
-			if ue_kind == 'quectel':
-				self.UEIPAddresses=[]
-				Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id])
-				Module_UE.GetModuleIPAddress()
-				self.UEIPAddresses.append(Module_UE.UEIPAddress)
-			elif ue_kind == 'amarisoft':
-				self.UEIPAddresses=['AS UE IP']
-				Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id])
-			else:
-				logging.debug("Incorrect UE Kind was detected")	
-
-		logging.debug(self.UEIPAddresses)
 		multi_jobs = []
 		i = 0
 		lock = Lock()
 		status_queue = SimpleQueue()
-		for UE_IPAddress in self.UEIPAddresses:
-			if self.ue_id=="":
-				device_id = self.UEDevices[i]
-			else:
-				device_id = Module_UE.ID + "-" + Module_UE.Kind 
-				logging.debug(device_id)
-			p = Process(target = self.Ping_common, args = (lock,UE_IPAddress,device_id,status_queue,EPC,Module_UE,RAN,))
+		for ue in ues:
+			p = Process(target = self.Ping_common, args = (lock,status_queue,EPC,ue,RAN,))
 			p.daemon = True
 			p.start()
 			multi_jobs.append(p)
@@ -1854,10 +846,10 @@ class OaiCiTest():
 
 		if (status_queue.empty()):
 			HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.ALL_PROCESSES_OK)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 		else:
 			ping_status = True
-			html_queue = SimpleQueue()
+			messages = []
 			while (not status_queue.empty()):
 				count = status_queue.get()
 				if (count < 0):
@@ -1865,13 +857,12 @@ class OaiCiTest():
 				device_id = status_queue.get()
 				ip_addr = status_queue.get()
 				message = status_queue.get()
-				html_cell = '<pre style="background-color:white">UE (' + device_id + ')\nIP Address  : ' + ip_addr + '\n' + message + '</pre>'
-				html_queue.put(html_cell)
+				messages.append(f'UE ({device_id})\nIP Address  : {ip_addr}\n{message}')
 			if (ping_status):
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', len(self.UEDevices), html_queue)
+				HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', messages)
 			else:
-				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+				HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', messages)
+				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def Iperf_ComputeTime(self):
 		result = re.search('-t (?P<iperf_time>\d+)', str(self.iperf_args))
@@ -1905,9 +896,9 @@ class OaiCiTest():
 			sys.exit(1)
 		return result
 
-	def Iperf_analyzeV2TCPOutput(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options,EPC,SSH):
+	def Iperf_analyzeV2TCPOutput(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options,EPC,SSH, filename):
 
-		SSH.command('awk -f /tmp/tcp_iperf_stats.awk ' + EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+		SSH.command(f'awk -f /tmp/tcp_iperf_stats.awk {filename}', '\$', 5)
 		result = re.search('Avg Bitrate : (?P<average>[0-9\.]+ Mbits\/sec) Max Bitrate : (?P<maximum>[0-9\.]+ Mbits\/sec) Min Bitrate : (?P<minimum>[0-9\.]+ Mbits\/sec)', SSH.getBefore())
 		if result is not None:
 			avgbitrate = result.group('average')
@@ -1938,7 +929,8 @@ class OaiCiTest():
 		result = re.search('-u', str(iperf_real_options))
 		if result is None:
 			logging.debug('Into Iperf_analyzeV2TCPOutput client')
-			response = self.Iperf_analyzeV2TCPOutput(lock, UE_IPAddress, device_id, statusQueue, iperf_real_options,EPC,SSH)
+			filename = EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log'
+			response = self.Iperf_analyzeV2TCPOutput(lock, UE_IPAddress, device_id, statusQueue, iperf_real_options, EPC, SSH, filename)
 			logging.debug('Iperf_analyzeV2TCPOutput response returned value = ' + str(response))
 			return response
 
@@ -2222,614 +1214,112 @@ class OaiCiTest():
 		statusQueue.put(msg)
 		lock.release()
 
-	def Iperf_UL_common(self, lock, UE_IPAddress, device_id, idx, ue_num, statusQueue,EPC):
+	def Iperf_Module(self, lock, statusQueue, EPC, ue, RAN, idx, ue_num):
 		SSH = sshconnection.SSHConnection()
-		udpIperf = True
-		result = re.search('-u', str(self.iperf_args))
-		if result is None:
-			udpIperf = False
-		ipnumbers = UE_IPAddress.split('.')
-		if (len(ipnumbers) == 4):
-			ipnumbers[3] = '1'
-		EPC_Iperf_UE_IPAddress = ipnumbers[0] + '.' + ipnumbers[1] + '.' + ipnumbers[2] + '.' + ipnumbers[3]
-
-		# Launch iperf server on EPC side (true for ltebox and old open-air-cn0
-		# But for OAI-Rel14-CUPS, we launch from python executor and we are using its IP address as iperf client address
-		launchFromEpc = True
-		if re.match('OAI-Rel14-CUPS', EPC.Type, re.IGNORECASE):
-			launchFromEpc = False
-			cmd = 'hostname -I'
-			ret = subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, encoding='utf-8')
-			if ret.stdout is not None:
-				EPC_Iperf_UE_IPAddress = ret.stdout.strip()
-		# When using a docker-based deployment, IPERF client shall be launched from trf container
-		launchFromTrfContainer = False
-		if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
-			launchFromTrfContainer = True
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			SSH.command('docker inspect --format="TRF_IP_ADDR = {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" prod-trf-gen', '\$', 5)
-			result = re.search('TRF_IP_ADDR = (?P<trf_ip_addr>[0-9\.]+)', SSH.getBefore())
-			if result is not None:
-				EPC_Iperf_UE_IPAddress = result.group('trf_ip_addr')
-			SSH.close()
-		port = 5001 + idx
-		udpOptions = ''
-		if udpIperf:
-			udpOptions = '-u '
-		if launchFromEpc:
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			SSH.command('cd ' + EPC.SourceCodePath + '/scripts', '\$', 5)
-			SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-			if launchFromTrfContainer:
-				if self.ueIperfVersion == self.dummyIperfVersion:
-					prefix = ''
-				else:
-					prefix = ''
-					if self.ueIperfVersion == '2.0.5':
-						prefix = '/iperf-2.0.5/bin/'
-				SSH.command('docker exec -d prod-trf-gen /bin/bash -c "nohup ' + prefix + 'iperf ' + udpOptions + '-s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &"', '\$', 5)
-			else:
-				SSH.command('echo $USER; nohup iperf ' + udpOptions + '-s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', EPC.UserName, 5)
-			SSH.close()
-		else:
-			if self.ueIperfVersion == self.dummyIperfVersion:
-				prefix = ''
-			else:
-				prefix = ''
-				if self.ueIperfVersion == '2.0.5':
-					prefix = '/opt/iperf-2.0.5/bin/'
-			cmd = 'nohup ' + prefix + 'iperf ' + udpOptions + '-s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log 2>&1 &'
-			logging.debug(cmd)
-			subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, encoding='utf-8')
-		time.sleep(0.5)
-
-		# Launch iperf client on UE
-		if (device_id == 'OAI-UE'):
-			SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-			SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
-		else:
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			SSH.command('cd ' + EPC.SourceCodePath+ '/scripts', '\$', 5)
-		iperf_time = self.Iperf_ComputeTime()
-		time.sleep(0.5)
-
-		if udpIperf:
-			modified_options = self.Iperf_ComputeModifiedBW(idx, ue_num)
-		else:
-			modified_options = str(self.iperf_args)
-		modified_options = modified_options.replace('-R','')
-		time.sleep(0.5)
-
-		SSH.command('rm -f iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-		if (device_id == 'OAI-UE'):
-			iperf_status = SSH.command('iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + ' -B ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
-		else:
-			if self.ADBCentralized:
-				iperf_status = SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '" 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
-			else:
-				iperf_status = SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '"\' 2>&1 > iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
-				SSH.command('fromdos -o iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-				SSH.command('cat iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-			# Copying locally iperf client for artifacting
-			SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, EPC.SourceCodePath+ '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
-		# TIMEOUT Case
-		if iperf_status < 0:
-			SSH.close()
-			message = 'iperf on UE (' + str(UE_IPAddress) + ') crashed due to TIMEOUT !'
-			logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-			SSH.close()
-			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
-			return
-		clientStatus = self.Iperf_analyzeV2Output(lock, UE_IPAddress, device_id, statusQueue, modified_options,EPC,SSH)
-		SSH.close()
-
-		# Kill iperf server on EPC side
-		if launchFromEpc:
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			if launchFromTrfContainer:
-				SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"', '\$', 5)
-			else:
-				SSH.command('killall --signal SIGKILL iperf', '\$', 5)
-			SSH.close()
-		else:
-			cmd = 'killall --signal SIGKILL iperf'
-			logging.debug(cmd)
-			subprocess.run(cmd, shell=True)
-			time.sleep(1)
-			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', EPC.SourceCodePath + '/scripts')
-		# in case of failure, retrieve server log
-		if (clientStatus == -1) or (clientStatus == -2):
-			if launchFromEpc:
-				time.sleep(1)
-				if (os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
-					os.remove('iperf_server_' + self.testCase_id + '_' + device_id + '.log')
-				if launchFromTrfContainer:
-					SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-					SSH.command('docker cp prod-trf-gen:/iperf-2.0.5/iperf_server_' + self.testCase_id + '_' + device_id + '.log ' + EPC.SourceCodePath + '/scripts', '\$', 5)
-					SSH.close()
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath+ '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
-			filename='iperf_server_' + self.testCase_id + '_' + device_id + '.log'
-			self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options,filename,0)
-		else:
-			# Copying all the time the iperf server for artifacting
-			if launchFromEpc:
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath+ '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
-		# in case of OAI-UE 
-		if (device_id == 'OAI-UE'):
-			SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
-			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_' + self.testCase_id + '_' + device_id + '.log', EPC.SourceCodePath + '/scripts')
-
-
-	def Iperf_Module(self, lock, UE_IPAddress, device_id, idx, ue_num, statusQueue,EPC, Module_UE, RAN):
-		SSH = sshconnection.SSHConnection()
-		server_filename = 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
-		client_filename = 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
+		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
+		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
 		if (re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE)) or (re.match('OAICN5G', EPC.Type, re.IGNORECASE)):
 			#retrieve trf-gen container IP address
 			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
 			SSH.command('docker inspect --format="TRF_IP_ADDR = {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" prod-trf-gen', '\$', 5)
 			result = re.search('TRF_IP_ADDR = (?P<trf_ip_addr>[0-9\.]+)', SSH.getBefore())
-			if result is not None:
-				trf_gen_IP = result.group('trf_ip_addr')
-			#kill iperf processes on EPC side
-			SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"', '\$', 5)
-			SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf3"', '\$', 5)
-			SSH.close()
-			#kill iperf processes on UE side before (in case there are still some remaining)
-			SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-			cmd = 'killall --signal=SIGKILL iperf'
-			SSH.command(cmd,'\$',5)
-			cmd = 'killall --signal=SIGKILL iperf3'
-			SSH.command(cmd,'\$',5)
+			if result is None:
+				raise Exception("could not corver prod-trf-gen IP address")
+			cn_target_ip = result.group('trf_ip_addr')
 			SSH.close()
+			cn_iperf_prefix = "docker exec -it prod-trf-gen" # -w /iperf-2.0.13  necessary?
+		else: # ltebox, sabox
+			cn_target_ip = "192.172.0.1"
+			cn_iperf_prefix = ""
 
-			iperf_time = self.Iperf_ComputeTime()
-			if self.iperf_direction=="DL":
-				logging.debug("Iperf for Module in DL mode detected")
-				##server side UE
-				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-				cmd = 'rm ' + server_filename
-				SSH.command(cmd,'\$',5)
-				cmd = 'echo $USER; nohup iperf -s -B ' + UE_IPAddress + ' -u -i 1 > ' + server_filename + ' 2>&1 &'
-				SSH.command(cmd,'\$',5)
-				SSH.close()
-				##client side EPC
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				#remove old client file in EPC.SourceCodePath
-				cmd = 'rm ' + EPC.SourceCodePath + '/' + client_filename 
-				SSH.command(cmd,'\$',5)
-				iperf_cmd = 'bin/iperf -c ' + UE_IPAddress + ' ' + self.iperf_args + ' > ' + client_filename + ' 2>&1'
-				cmd = 'docker exec -w /iperf-2.0.13 -it prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"' 
-				SSH.command(cmd,'\$',int(iperf_time)*5.0)
-				SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/'+ client_filename + ' ' + EPC.SourceCodePath, '\$', 5)
-				SSH.close()
+		iperf_opt = self.iperf_args
+		udpIperf = re.search('-u', iperf_opt) is not None
+		udpSwitch = '-u' if udpIperf else ''
+		if udpIperf:
+			iperf_opt = self.Iperf_ComputeModifiedBW(idx, ue_num)
+			logging.info(f'iperf options modified from "{self.iperf_args}" to "{iperf_opt}" for {ue.getName()}')
+		iperf_time = int(self.Iperf_ComputeTime())
+		port = f'-p {5001+idx}'
+		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
+		iperf_ue = '/data/local/tmp/iperf' if re.search('adb', ue.getName()) else 'iperf'
 
-				#copy the 2 resulting files locally (python executor)
-				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, server_filename, '.')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + client_filename, '.')
-				#send for analysis
-				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,server_filename,1)	
+		if self.iperf_direction == "DL":
+			logging.debug("Iperf in DL requested")
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.run(f'rm {server_filename}')
+			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -s -B {ue.getIP()} {udpSwitch} -i 1 -t {iperf_time * 1.5} {port} &> /tmp/{server_filename} &')
+			cmd.close()
 
-			elif self.iperf_direction=="UL":
-				logging.debug("Iperf for Module in UL mode detected")
-				#server side EPC
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.run(f'rm {EPC.SourceCodePath}/{client_filename}')
+			cmd.run(f'{cn_iperf_prefix} iperf -c {ue.getIP()} {iperf_opt} {port} &> {EPC.SourceCodePath}/{client_filename}', timeout=iperf_time * 1.5)
+			cmd.copyin(f'{EPC.SourceCodePath}/{client_filename}', client_filename)
+			cmd.close()
 
-				iperf_cmd = 'echo $USER; nohup bin/iperf -s -u -i 1 > ' + server_filename + ' 2>&1'
-				cmd = 'docker exec -d -w /iperf-2.0.13 prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"' 
-				SSH.command(cmd,'\$',5)
-				SSH.close()
-
-				#client side UE
-				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-				cmd = 'rm '+ client_filename
-				SSH.command(cmd,'\$',5)
-				SSH.command('iperf -B ' + UE_IPAddress + ' -c ' +  trf_gen_IP + ' '  + self.iperf_args + ' > ' + client_filename + ' 2>&1', '\$', int(iperf_time)*5.0)
-				SSH.close()
-
-				#once client is done, retrieve the server file from container to EPC Host
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/' + server_filename + ' ' + EPC.SourceCodePath, '\$', 5)
-				SSH.close()
-
-				#copy the 2 resulting files locally 
-				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, client_filename, '.')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
-				#send for analysis
-				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,server_filename,1)
-
-			elif self.iperf_direction=="BIDIR":
-				logging.debug("Iperf for Module in BIDIR mode detected")
-
-				#server side EPC
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				iperf_cmd = 'echo $USER; nohup /usr/local/bin/iperf3 -s -i 1 > ' + server_filename + ' 2>&1'
-				cmd = 'docker exec -d -w /iperf-2.0.13 prod-trf-gen /bin/bash -c \"' + iperf_cmd + '\"' 
-				SSH.command(cmd,'\$',5)
-				SSH.close()
-
-				#client side UE
-				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-				cmd = 'rm '+ client_filename
-				SSH.command(cmd,'\$',5)
-				SSH.command('iperf3 -B ' + UE_IPAddress + ' -c ' +  trf_gen_IP + ' '  + self.iperf_args + ' > ' + client_filename + ' 2>&1', '\$', int(iperf_time)*5.0)
-				SSH.close()
-
-				#once client is done, retrieve the server file from container to EPC Host
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				#remove old server file in EPC.SourceCodePath
-				cmd = 'rm ' + EPC.SourceCodePath + '/' + server_filename 
-				SSH.command(cmd,'\$',5)
-				#copy from docker container to EPC.SourceCodePath
-				SSH.command('docker cp prod-trf-gen:/iperf-2.0.13/' + server_filename + ' ' + EPC.SourceCodePath, '\$', 5)
-				SSH.close()
-
-				#copy the 2 resulting files locally 
-				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, client_filename, '.')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/' + server_filename, '.')
-
-				#send for analysis
-				self.Iperf_analyzeV2BIDIR(lock, UE_IPAddress, device_id, statusQueue, server_filename, client_filename)
-
-			else :
-				logging.debug("Incorrect or missing IPERF direction in XML")
-
-		else: 		#default is ltebox
-
-			#kill iperf processes before (in case there are still some remaining)
-			SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-			cmd = 'killall --signal=SIGKILL iperf'
-			SSH.command(cmd,'\$',5)
-			cmd = 'killall --signal=SIGKILL iperf3'
-			SSH.command(cmd,'\$',5)
-			SSH.close()
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			cmd = 'killall --signal=SIGKILL iperf'
-			SSH.command(cmd,'\$',5)
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			cmd = 'killall --signal=SIGKILL iperf3'
-			SSH.command(cmd,'\$',5)
-			SSH.close()
-
-
-			iperf_time = self.Iperf_ComputeTime()	
-			if self.iperf_direction=="DL":
-				logging.debug("Iperf for Module in DL mode detected")
-				#server side UE
-				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-				cmd = 'rm iperf_server_' +  self.testCase_id + '_' + self.ue_id + '.log'
-				SSH.command(cmd,'\$',5)
-				cmd = 'echo $USER; nohup /opt/iperf-2.0.10/iperf -s -B ' + UE_IPAddress + ' -u -i 1 > iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log 2>&1 &' 
-				SSH.command(cmd,'\$',5)
-				SSH.close()
-				#client side EPC
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				cmd = 'rm iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
-				SSH.command(cmd,'\$',5)
-				cmd = 'iperf -c ' + UE_IPAddress + ' ' + self.iperf_args + ' > iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log 2>&1' 
-				SSH.command(cmd,'\$',int(iperf_time)*5.0)
-				SSH.close()
-				#copy the 2 resulting files locally
-				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log', '.')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log', '.')
-				#send for analysis
-				filename='iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
-				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,filename,1)	
-
-			elif self.iperf_direction=="UL":
-				logging.debug("Iperf for Module in UL mode detected")
-				#server side EPC
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				cmd = 'rm iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
-				SSH.command(cmd,'\$',5)
-				cmd = 'echo $USER; nohup iperf -s -u -i 1 > iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log 2>&1 &'
-				SSH.command(cmd,'\$',5)
-				SSH.close()
-
-				#client side UE
-				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-				cmd = 'rm iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
-				SSH.command(cmd,'\$',5)
-				SSH.command('/opt/iperf-2.0.10/iperf -c 192.172.0.1 ' + self.iperf_args + ' > iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log 2>&1', '\$', int(iperf_time)*5.0)
-				SSH.close()
-
-				#copy the 2 resulting files locally
-				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log', '.')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log', '.')
-				#send for analysis
-				filename='iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
-				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,filename,1)
-			elif self.iperf_direction=="BIDIR":
-				logging.debug("Iperf for Module in BIDIR mode detected")
-
-
-				#server side EPC
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				cmd = 'rm ' + server_filename
-				SSH.command(cmd,'\$',5)
-				cmd = 'echo $USER; nohup iperf3 -s -i 1 > '+server_filename+' 2>&1 &'
-				SSH.command(cmd,'\$',5)
-				SSH.close()
-
-				#client side UE
-				SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-				cmd = 'rm ' + client_filename
-				SSH.command(cmd,'\$',5)
-				SSH.command('iperf3 -c 192.172.0.1 ' + self.iperf_args + ' > '+client_filename + ' 2>&1', '\$', int(iperf_time)*5.0)
-				SSH.close()
-
-				#copy the 2 resulting files locally
-				SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, client_filename, '.')
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, server_filename, '.')
-				#send for analysis
-				self.Iperf_analyzeV2BIDIR(lock, UE_IPAddress, device_id, statusQueue, server_filename, client_filename)
-			else :
-				logging.debug("Incorrect or missing IPERF direction in XML")
-
-
-			#kill iperf processes after to be clean
-			SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-			cmd = 'killall --signal=SIGKILL iperf'
-			SSH.command(cmd,'\$',5)
-			cmd = 'killall --signal=SIGKILL iperf3'
-			SSH.command(cmd,'\$',5)
-			SSH.close()
-			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-			cmd = 'killall --signal=SIGKILL iperf'
-			SSH.command(cmd,'\$',5)
-			cmd = 'killall --signal=SIGKILL iperf3'
-			SSH.command(cmd,'\$',5)
-			SSH.close()
-
-		# Copying to xNB server for Jenkins artifacting
-		if (os.path.isfile(server_filename)):
-			SSH.copyout(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, server_filename, RAN.eNBSourceCodePath + '/cmake_targets/')
-		if (os.path.isfile(client_filename)):
-			SSH.copyout(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, client_filename, RAN.eNBSourceCodePath + '/cmake_targets/')
-
-	def Iperf_common(self, lock, UE_IPAddress, device_id, idx, ue_num, statusQueue,EPC):
-		try:
-			SSH = sshconnection.SSHConnection()
-			# Single-UE profile -- iperf only on one UE
-			if self.iperf_profile == 'single-ue' and idx != 0:
-				return
-			useIperf3 = False
-			udpIperf = True
-
-			self.ueIperfVersion = '2.0.5'
-			if (device_id != 'OAI-UE'):
-				SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-				# if by chance ADB server and EPC are on the same remote host, at least log collection will take care of it
-				SSH.command('if [ ! -d ' + EPC.SourceCodePath + '/scripts ]; then mkdir -p ' + EPC.SourceCodePath + '/scripts ; fi', '\$', 5)
-				SSH.command('cd ' + EPC.SourceCodePath + '/scripts', '\$', 5)
-				# Checking if iperf / iperf3 are installed
-				if self.ADBCentralized:
-					SSH.command('adb -s ' + device_id + ' shell "ls /data/local/tmp"', '\$', 5)
-				else:
-					SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ls /data/local/tmp"\'', '\$', 60)
-				# DEBUG: disabling iperf3 usage for the moment
-				result = re.search('iperf4', SSH.getBefore())
-				if result is None:
-					result = re.search('iperf', SSH.getBefore())
-					if result is None:
-						message = 'Neither iperf nor iperf3 installed on UE!'
-						logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-						SSH.close()
-						self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
-						return
-					else:
-						if self.ADBCentralized:
-							SSH.command('adb -s ' + device_id + ' shell "/data/local/tmp/iperf --version"', '\$', 5)
-						else:
-							SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf --version"\'', '\$', 60)
-						result = re.search('iperf version 2.0.5', SSH.getBefore())
-						if result is not None:
-							self.ueIperfVersion = '2.0.5'
-						result = re.search('iperf version 2.0.10', SSH.getBefore())
-						if result is not None:
-							self.ueIperfVersion = '2.0.10'
-				else:
-					useIperf3 = True
-				SSH.close()
-			else:
-				SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-				SSH.command('iperf --version', '\$', 5)
-				result = re.search('iperf version 2.0.5', SSH.getBefore())
-				if result is not None:
-					self.ueIperfVersion = '2.0.5'
-				result = re.search('iperf version 2.0.10', SSH.getBefore())
-				if result is not None:
-					self.ueIperfVersion = '2.0.10'
-				SSH.close()
-			# in case of iperf, UL has its own function
-			if (not useIperf3):
-				result = re.search('-R', str(self.iperf_args))
-				if result is not None:
-					self.Iperf_UL_common(lock, UE_IPAddress, device_id, idx, ue_num, statusQueue,EPC)
-					return
-
-			# Launch the IPERF server on the UE side for DL
-			if (device_id == 'OAI-UE'):
-				SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-				SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
-				SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-				result = re.search('-u', str(self.iperf_args))
-				if result is None:
-					SSH.command('echo $USER; nohup iperf -B ' + UE_IPAddress + ' -s -i 1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.UEUserName, 5)
-					udpIperf = False
-				else:
-					SSH.command('echo $USER; nohup iperf -B ' + UE_IPAddress + ' -u -s -i 1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.UEUserName, 5)
-			else:
-				SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-				SSH.command('cd ' + EPC.SourceCodePath + '/scripts', '\$', 5)
-				if self.ADBCentralized:
-					if (useIperf3):
-						SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/iperf3 -s &', '\$', 5)
-					else:
-						SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-						result = re.search('-u', str(self.iperf_args))
-						if result is None:
-							SSH.command('echo $USER; nohup adb -s ' + device_id + ' shell "/data/local/tmp/iperf -s -i 1" > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 5)
-							udpIperf = False
-						else:
-							SSH.command('echo $USER; nohup adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 5)
-				else:
-					SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-					SSH.command('echo $USER; nohup ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" \' 2>&1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 60)
-
-			time.sleep(0.5)
-			SSH.close()
-
-			# Launch the IPERF client on the EPC side for DL (true for ltebox and old open-air-cn
-			# But for OAI-Rel14-CUPS, we launch from python executor
-			launchFromEpc = True
-			launchFromModule = False
-			if re.match('OAI-Rel14-CUPS', EPC.Type, re.IGNORECASE):
-				launchFromEpc = False
-			#if module
-			if self.ue_id!='' and self.iperf :
-				launchFromEpc = False
-				launchfromModule = True
-			# When using a docker-based deployment, IPERF client shall be launched from trf container
-			launchFromTrfContainer = False
-			if re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE):
-				launchFromTrfContainer = True
-			if launchFromEpc:
-				SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-				SSH.command('cd ' + EPC.SourceCodePath + '/scripts', '\$', 5)
-			iperf_time = self.Iperf_ComputeTime()
-			time.sleep(0.5)
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.copyin(f'/tmp/{server_filename}', server_filename)
+			cmd.close()
 
 			if udpIperf:
-				modified_options = self.Iperf_ComputeModifiedBW(idx, ue_num)
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
 			else:
-				modified_options = str(self.iperf_args)
-			time.sleep(0.5)
+				cmd = cls_cmd.getConnection(EPC.IPAddress)
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f"{EPC.SourceCodePath}/{client_filename}")
+				cmd.close()
 
-			if launchFromEpc:
-				SSH.command('rm -f iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+		elif self.iperf_direction == "UL":
+			logging.debug("Iperf in UL requested")
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.run(f'rm {EPC.SourceCodePath}/{server_filename}')
+			cmd.run(f'{cn_iperf_prefix} iperf -s {udpSwitch} -1 -t {iperf_time * 1.5} {port} &> {EPC.SourceCodePath}/{server_filename} &')
+			cmd.close()
+
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.run(f'rm /tmp/{client_filename}')
+			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ue.getIP()} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
+			cmd.copyin(f'/tmp/{client_filename}', client_filename)
+			cmd.close()
+
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.copyin(f'{EPC.SourceCodePath}/{server_filename}', server_filename)
+			cmd.close()
+
+			if udpIperf:
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
 			else:
-				if (os.path.isfile('iperf_' + self.testCase_id + '_' + device_id + '.log')):
-					os.remove('iperf_' + self.testCase_id + '_' + device_id + '.log')
-			if (useIperf3):
-				SSH.command('stdbuf -o0 iperf3 -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
-				# Copying the iperf client locally for artifacting
-				SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
+				cmd = cls_cmd.getConnection(ue.getHost())
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f"/tmp/{client_filename}")
+				cmd.close()
 
-				clientStatus = 0
-				self.Iperf_analyzeV3Output(lock, UE_IPAddress, device_id, statusQueue,SSH)
-			else:
-				if launchFromEpc:
-					if launchFromTrfContainer:
-						if self.ueIperfVersion == self.dummyIperfVersion:
-							prefix = ''
-						else:
-							prefix = ''
-							if self.ueIperfVersion == '2.0.5':
-								prefix = '/iperf-2.0.5/bin/'
-						iperf_status = SSH.command('docker exec -it prod-trf-gen /bin/bash -c "' + prefix + 'iperf -c ' + UE_IPAddress + ' ' + modified_options + '" 2>&1 | tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
-					else:
-						iperf_status = SSH.command('stdbuf -o0 iperf -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
-					# Copying the iperf client locally for artifacting
-					SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
-				else:
-					if self.ueIperfVersion == self.dummyIperfVersion:
-						prefix = ''
-					else:
-						prefix = ''
-						if self.ueIperfVersion == '2.0.5':
-							prefix = '/opt/iperf-2.0.5/bin/'
-					cmd = prefix + 'iperf -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 > iperf_' + self.testCase_id + '_' + device_id + '.log'
-					message = cmd + '\n'
-					logging.debug(cmd)
-					ret = subprocess.run(cmd, shell=True)
-					iperf_status = ret.returncode
-					SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_' + self.testCase_id + '_' + device_id + '.log', EPC.SourceCodePath + '/scripts')					
-					SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-					SSH.command('cat ' + EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
-				if iperf_status < 0:
-					if launchFromEpc:
-						SSH.close()
-					message = 'iperf on UE (' + str(UE_IPAddress) + ') crashed due to TIMEOUT !'
-					logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
-					self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
-					return
-				logging.debug('Into Iperf_analyzeV2Output client')
-				clientStatus = self.Iperf_analyzeV2Output(lock, UE_IPAddress, device_id, statusQueue, modified_options, EPC,SSH)
-				logging.debug('Iperf_analyzeV2Output clientStatus returned value = ' + str(clientStatus))
-			SSH.close()
+		elif self.iperf_direction=="BIDIR":
+			logging.debug("Bi-directional iperf requested")
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.run(f'rm {EPC.SourceCodePath}/{server_filename}')
+			cmd.run(f'{cn_iperf_prefix} iperf3 -s -i 1 -1 {port} &> {EPC.SourceCodePath}/{server_filename} &')
+			cmd.close()
 
-			# Kill the IPERF server that runs in background
-			if (device_id == 'OAI-UE'):
-				SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-				SSH.command('killall iperf', '\$', 5)
-			else:
-				SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-				if self.ADBCentralized:
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell ps | grep --color=never iperf | grep -v grep', '\$', 5)
-				else:
-					SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ps" | grep --color=never iperf | grep -v grep\'', '\$', 60)
-				result = re.search('shell +(?P<pid>\d+)', SSH.getBefore())
-				if result is not None:
-					pid_iperf = result.group('pid')
-					if self.ADBCentralized:
-						SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell kill -KILL ' + pid_iperf, '\$', 5)
-					else:
-						SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"\'', '\$', 60)
-			SSH.close()
-			# if the client report is absent, try to analyze the server log file
-			if (clientStatus == -1):
-				time.sleep(1)
-				if (os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
-					os.remove('iperf_server_' + self.testCase_id + '_' + device_id + '.log')
-				if (device_id == 'OAI-UE'):
-					SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
-				else:
-					SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, EPC.SourceCodePath + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
-				# fromdos has to be called on the python executor not on ADB server
-				cmd = 'fromdos -o iperf_server_' + self.testCase_id + '_' + device_id + '.log > /dev/null 2>&1'
-				try:
-					subprocess.run(cmd, shell=True)
-				except:
-					pass
-				cmd = 'dos2unix -o iperf_server_' + self.testCase_id + '_' + device_id + '.log > /dev/null 2>&1'
-				try:
-					subprocess.run(cmd, shell=True)
-				except:
-					pass
-				filename='iperf_server_' + self.testCase_id + '_' + device_id + '.log'
-				self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options,filename,0)
-			else:
-				# Copying all the time the iperf server for artifacting
-				time.sleep(1)
-				if (device_id == 'OAI-UE'):
-					SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
-				else:
-					SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, EPC.SourceCodePath + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.run(f'rm /tmp/{client_filename}')
+			cmd.run(f'iperf3 -B {ue.getIP()} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
+			cmd.copyin(f'/tmp/{client_filename}', client_filename)
+			cmd.close()
 
-			# in case of OAI UE: 
-			if (device_id == 'OAI-UE'):
-				if (os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
-					if not launchFromEpc:
-						SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', EPC.SourceCodePath + '/scripts')
-				else:
-					SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
-					SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', EPC.SourceCodePath + '/scripts')
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.copyin(f'{EPC.SourceCodePath}/{server_filename}', server_filename)
+			cmd.close()
 
-	def IperfNoS1(self,HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS):
+			self.Iperf_analyzeV2BIDIR(lock, ue.getHost(), ue.getName(), statusQueue, server_filename, client_filename)
+
+		else :
+			raise Exception("Incorrect or missing IPERF direction in XML")
+
+	def IperfNoS1(self,HTML,RAN,EPC,CONTAINERS):
 		SSH = sshconnection.SSHConnection()
 		if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		check_eNB = True
 		check_OAI_UE = True
-		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-		if (pStatus < 0):
-			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-			return
 		server_on_enb = re.search('-R', str(self.iperf_args))
 		if server_on_enb is not None:
 			iServerIPAddr = RAN.eNBIPAddress
@@ -2909,7 +1399,7 @@ class OaiCiTest():
 			iperf_status = False
 		else:
 			iperf_status = True
-		html_queue = SimpleQueue()
+		messages = []
 		while (not status_queue.empty()):
 			count = status_queue.get()
 			if (count < 0):
@@ -2919,49 +1409,35 @@ class OaiCiTest():
 			device_id = status_queue.get()
 			ip_addr = status_queue.get()
 			message = status_queue.get()
-			html_cell = '<pre style="background-color:white">UE (' + device_id + ')\nIP Address  : ' + ip_addr + '\n' + message + '</pre>'
-			html_queue.put(html_cell)
+			messages.append(f'UE ({device_id})\nIP Address  : {ip_addr}\n{message}')
 		if (iperf_noperf and iperf_status):
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', len(self.UEDevices), html_queue)
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', messages)
 		elif (iperf_status):
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', len(self.UEDevices), html_queue)
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages)
 		else:
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', len(self.UEDevices), html_queue)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
+			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
-	def Iperf(self,HTML,RAN,EPC,COTS_UE, InfraUE,CONTAINERS):
+	def Iperf(self,HTML,RAN,EPC,CONTAINERS):
 		result = re.search('noS1', str(RAN.Initialize_eNB_args))
 		if result is not None:
-			self.IperfNoS1(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
+			self.IperfNoS1(HTML,RAN,EPC,CONTAINERS)
 			return
-		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '' or self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
+		if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		check_eNB = True
-		if (len(self.UEDevices) == 1) and (self.UEDevices[0] == 'OAI-UE'):
-			check_OAI_UE = True
-		else:
-			check_OAI_UE = False
-		pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
-		if (pStatus < 0):
-			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', pStatus)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-			return
-
-		if self.ue_id=="":#is not a module, follow legacy code
-			ueIpStatus = self.GetAllUEIPAddresses()
-			if (ueIpStatus < 0):
-				HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				return
-		else: #is a module
-			self.UEIPAddresses=[]
-			Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id])
-			Module_UE.GetModuleIPAddress()
-			self.UEIPAddresses.append(Module_UE.UEIPAddress)
-
 
+		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_direction "{self.iperf_direction}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
 
+		ues = []
+		for ue_name in self.ue_ids:
+			ue = cls_module_ue.Module_UE(ue_name)
+			if not ue.getIP():
+				logging.error("no IP addresses returned")
+				HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
+				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
+			ues.append(ue)
+		logging.debug(ues)
 
 		self.dummyIperfVersion = '2.0.10'
 		#cmd = 'iperf --version'
@@ -2975,19 +1451,12 @@ class OaiCiTest():
 		#	dummyIperfVersion = '2.0.10'
 
 		multi_jobs = []
+		ue_num = len(ues)
 		i = 0
-		ue_num = len(self.UEIPAddresses)
 		lock = Lock()
 		status_queue = SimpleQueue()
-		logging.debug(self.UEIPAddresses)
-		for UE_IPAddress in self.UEIPAddresses:
-			device_id = self.UEDevices[i]
-        	#special quick and dirty treatment for modules, iperf to be restructured
-			if self.ue_id!="": #is module
-				device_id = Module_UE.ID + "-" + Module_UE.Kind
-				p = Process(target = self.Iperf_Module ,args = (lock, UE_IPAddress, device_id, i, ue_num, status_queue, EPC, Module_UE, RAN, ))
-			else: #legacy code
-				p = Process(target = self.Iperf_common, args = (lock, UE_IPAddress, device_id, i, ue_num, status_queue, EPC, ))
+		for ue in ues:
+			p = Process(target = self.Iperf_Module ,args = (lock, status_queue, EPC, ue, RAN, i, ue_num))
 			p.daemon = True
 			p.start()
 			multi_jobs.append(p)
@@ -2997,11 +1466,11 @@ class OaiCiTest():
 
 		if (status_queue.empty()):
 			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.ALL_PROCESSES_OK)
-			self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 		else:
 			iperf_status = True
 			iperf_noperf = False
-			html_queue = SimpleQueue()
+			messages = []
 			while (not status_queue.empty()):
 				count = status_queue.get()
 				if (count < 0):
@@ -3010,113 +1479,15 @@ class OaiCiTest():
 					iperf_noperf = True
 				device_id = status_queue.get()
 				ip_addr = status_queue.get()
-				message = status_queue.get()
-				html_cell = '<pre style="background-color:white">UE (' + device_id + ')\nIP Address  : ' + ip_addr + '\n' + message + '</pre>'
-				html_queue.put(html_cell)
+				msg = status_queue.get()
+				messages.append(f'UE ({device_id})\nIP Address  : {ip_addr}\n{msg}')
 			if (iperf_noperf and iperf_status):
-				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', len(self.UEDevices), html_queue)
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', messages)
 			elif (iperf_status):
-				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', len(self.UEDevices), html_queue)
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages)
 			else:
-				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', len(self.UEDevices), html_queue)
-				self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-
-	def CheckProcessExist(self, check_eNB, check_OAI_UE,RAN,EPC):
-		multi_jobs = []
-		status_queue = SimpleQueue()
-		# in noS1 config, no need to check status from EPC
-		# in gNB also currently no need to check
-		result = re.search('noS1|band78', str(RAN.Initialize_eNB_args))
-		if result is None:
-			p = Process(target = EPC.CheckHSSProcess, args = (status_queue,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-			p = Process(target = EPC.CheckMMEProcess, args = (status_queue,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-			p = Process(target = EPC.CheckSPGWProcess, args = (status_queue,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-		else:
-			if (check_eNB == False) and (check_OAI_UE == False):
-				return 0
-		if check_eNB:
-			p = Process(target = RAN.CheckeNBProcess, args = (status_queue,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-		if check_OAI_UE:
-			p = Process(target = self.CheckOAIUEProcess, args = (status_queue,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-		for job in multi_jobs:
-			job.join()
-
-		if (status_queue.empty()):
-			return -15
-		else:
-			result = 0
-			while (not status_queue.empty()):
-				status = status_queue.get()
-				if (status < 0):
-					result = status
-			if result == CONST.ENB_PROCESS_FAILED:
-				fileCheck = re.search('enb_', str(RAN.eNBLogFiles[0]))
-				if fileCheck is not None:
-					SSH.copyin(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, RAN.eNBSourceCodePath + '/cmake_targets/' + RAN.eNBLogFiles[0], '.')
-					logStatus = RAN.AnalyzeLogFile_eNB(RAN.eNBLogFiles[0],HTML, RAN.ran_checkers)
-					if logStatus < 0:
-						result = logStatus
-					RAN.eNBLogFiles[0]=''
-			return result
-
-	def CheckOAIUEProcessExist(self, initialize_OAI_UE_flag,HTML,RAN):
-		multi_jobs = []
-		status_queue = SimpleQueue()
-		if initialize_OAI_UE_flag == False:
-			p = Process(target = self.CheckOAIUEProcess, args = (status_queue,))
-			p.daemon = True
-			p.start()
-			multi_jobs.append(p)
-		for job in multi_jobs:
-			job.join()
-
-		if (status_queue.empty()):
-			return -15
-		else:
-			result = 0
-			while (not status_queue.empty()):
-				status = status_queue.get()
-				if (status < 0):
-					result = status
-			if result == CONST.OAI_UE_PROCESS_FAILED:
-				fileCheck = re.search('ue_', str(self.UELogFile))
-				if fileCheck is not None:
-					SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
-					logStatus = self.AnalyzeLogFile_UE(self.UELogFile,HTML,RAN)
-					if logStatus < 0:
-						result = logStatus
-			return result
-
-	def CheckOAIUEProcess(self, status_queue):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-			SSH.command('stdbuf -o0 ps -aux | grep --color=never ' + self.air_interface + ' | grep -v grep', '\$', 5)
-			result = re.search(self.air_interface, SSH.getBefore())
-			if result is None:
-				logging.debug('\u001B[1;37;41m OAI UE Process Not Found! \u001B[0m')
-				status_queue.put(CONST.OAI_UE_PROCESS_FAILED)
-			else:
-				status_queue.put(CONST.OAI_UE_PROCESS_OK)
-			SSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
+				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
 		if (not os.path.isfile('./' + UElogFile)):
@@ -3386,77 +1757,16 @@ class OaiCiTest():
 				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
 		return global_status
 
+	def TerminateUE(self, HTML):
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		with concurrent.futures.ThreadPoolExecutor() as executor:
+			futures = [executor.submit(ue.terminate) for ue in ues]
+			archives = [f.result() for f in futures]
+		archive_info = [f'Log at: {a}' if a else 'No log available' for a in archives]
+		messages = [f"UE {ue.getName()}: {log}" for (ue, log) in zip(ues, archive_info)]
+		HTML.CreateHtmlTestRowQueue(f'N/A', 'OK', messages)
 
-	def TerminateUE_common(self, device_id, idx,COTS_UE):
-		try:
-			SSH = sshconnection.SSHConnection()
-			SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
-			# back in airplane mode on (ie radio off)
-			if self.ADBCentralized:
-				#RH quick add on to intgrate cots control defined by yaml
-				#if device Id exists in yaml dictionary, we execute the new procedure defined in cots_ue class
-				#otherwise we use the legacy procedure 
-				if COTS_UE.Check_Exists(device_id):
-					#switch device to Airplane mode ON (ie Radio OFF)
-					COTS_UE.Set_Airplane(device_id, 'ON')
-				elif device_id == '84B7N16418004022':
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
-				else:
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
-			else:
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
-			logging.debug('\u001B[1mUE (' + device_id + ') Detach Completed\u001B[0m')
-
-			if self.ADBCentralized:
-				SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "ps | grep --color=never iperf | grep -v grep"', '\$', 5)
-			else:
-				SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ps | grep --color=never iperf | grep -v grep"\'', '\$', 60)
-			result = re.search('shell +(?P<pid>\d+)', SSH.getBefore())
-			if result is not None:
-				pid_iperf = result.group('pid')
-				if self.ADBCentralized:
-					SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"', '\$', 5)
-				else:
-					SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"\'', '\$', 60)
-			SSH.close()
-		except:
-			os.kill(os.getppid(),signal.SIGUSR1)
-
-	def TerminateUE(self,HTML,COTS_UE,InfraUE,ue_trace):
-		if self.ue_id=='':#no ID specified, then it is a COTS controlled by ADB
-			terminate_ue_flag = False
-			self.GetAllUEDevices(terminate_ue_flag)
-			multi_jobs = []
-			i = 0
-			for device_id in self.UEDevices:
-				p = Process(target= self.TerminateUE_common, args = (device_id,i,COTS_UE,))
-				p.daemon = True
-				p.start()
-				multi_jobs.append(p)
-				i += 1
-			for job in multi_jobs:
-				job.join()
-			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		else: #if an ID is specified, it is a module from the yaml infrastructure file
-			ue_kind = InfraUE.ci_ue_infra[self.ue_id]['Kind']
-			logging.debug("Detected UE Kind : " + ue_kind)
-			if ue_kind == 'quectel':
-				Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra[self.ue_id])
-				Module_UE.ue_trace=ue_trace
-				Module_UE.Command("detach")
-				Module_UE.DisableTrace()
-				Module_UE.DisableCM()
-				archive_destination=Module_UE.LogCollect()
-				if Module_UE.ue_trace=='yes':
-					HTML.CreateHtmlTestRow('QLog at : '+archive_destination, 'OK', CONST.ALL_PROCESSES_OK)
-				else:
-					HTML.CreateHtmlTestRow('QLog trace is disabled', 'OK', CONST.ALL_PROCESSES_OK)
-			elif ue_kind == 'amarisoft':
-				HTML.CreateHtmlTestRow('AS UE is already terminated', 'OK', CONST.ALL_PROCESSES_OK)
-			else:
-				logging.debug("Incorrect UE Kind was detected")
-
-	def TerminateOAIUE(self,HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS):
+	def TerminateOAIUE(self,HTML,RAN,EPC,CONTAINERS):
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
 		SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
@@ -3497,11 +1807,11 @@ class OaiCiTest():
 					# Not an error then
 					if (logStatus != CONST.OAI_UE_PROCESS_COULD_NOT_SYNC) or (ueAction != 'Sniffing'):
 						self.Initialize_OAI_UE_args = ''
-						self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+						self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 				else:
 					if (logStatus == CONST.OAI_UE_PROCESS_COULD_NOT_SYNC):
 						self.Initialize_OAI_UE_args = ''
-						self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+						self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 			else:
 				logging.debug('\u001B[1m' + ueAction + ' Completed \u001B[0m')
 				HTML.htmlUEFailureMsg='<b>' + ueAction + ' Completed</b>\n' + HTML.htmlUEFailureMsg
@@ -3510,21 +1820,15 @@ class OaiCiTest():
 		else:
 			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
-	def AutoTerminateUEandeNB(self,HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS):
-		if (self.ADBIPAddress != 'none'):
-			self.testCase_id = 'AUTO-KILL-UE'
-			HTML.testCase_id = self.testCase_id
-			self.desc = 'Automatic Termination of UE'
-			HTML.desc = self.desc
-			self.ShowTestID()
-			self.TerminateUE(HTML,COTS_UE,InfraUE,self.ue_trace)
+	def AutoTerminateUEandeNB(self,HTML,RAN,EPC,CONTAINERS):
+		# TODO: terminate UE?
 		if (self.Initialize_OAI_UE_args != ''):
 			self.testCase_id = 'AUTO-KILL-OAI-UE'
 			HTML.testCase_id = self.testCase_id
 			self.desc = 'Automatic Termination of OAI-UE'
 			HTML.desc = self.desc
 			self.ShowTestID()
-			self.TerminateOAIUE(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+			self.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
 		if (RAN.Initialize_eNB_args != ''):
 			self.testCase_id = 'AUTO-KILL-RAN'
 			HTML.testCase_id = self.testCase_id
@@ -3576,7 +1880,6 @@ class OaiCiTest():
 					CONTAINERS.UndeployObject(HTML,RAN)
 		RAN.prematureExit=True
 
-
 	def IdleSleep(self,HTML):
 		time.sleep(self.idle_sleep_time)
 		HTML.CreateHtmlTestRow(str(self.idle_sleep_time) + ' sec', 'OK', CONST.ALL_PROCESSES_OK)
@@ -3698,102 +2001,6 @@ class OaiCiTest():
 		SSH.command('echo ' + self.UEPassword + ' | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
 		SSH.close()
 
-	def RetrieveSystemVersion(self, machine,HTML,RAN):
-		if RAN.eNBIPAddress == 'none' or self.UEIPAddress == 'none':
-			HTML.OsVersion[0]='Ubuntu 16.04.5 LTS'
-			HTML.KernelVersion[0]='4.15.0-45-generic'
-			HTML.UhdVersion[0]='3.13.0.1-0'
-			HTML.UsrpBoard[0]='B210'
-			HTML.CpuNb[0]='4'
-			HTML.CpuModel[0]='Intel(R) Core(TM) i5-6200U'
-			HTML.CpuMHz[0]='2399.996 MHz'
-			return 0
-		if machine == 'eNB':
-			if RAN.eNBIPAddress != '' and RAN.eNBUserName != '' and RAN.eNBPassword != '':
-				IPAddress = RAN.eNBIPAddress
-				UserName = RAN.eNBUserName
-				Password = RAN.eNBPassword
-				idx = 0
-			else:
-				return -1
-		if machine == 'UE':
-			if self.UEIPAddress != '' and self.UEUserName != '' and self.UEPassword != '':
-				IPAddress = self.UEIPAddress
-				UserName = self.UEUserName
-				Password = self.UEPassword
-				idx = 1
-			else:
-				return -1
-
-		SSH = sshconnection.SSHConnection()
-		SSH.open(IPAddress, UserName, Password)
-		SSH.command('lsb_release -a', '\$', 5)
-		result = re.search('Description:\t(?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', SSH.getBefore())
-		if result is not None:
-			OsVersion = result.group('os_type')
-			logging.debug('OS is: ' + OsVersion)
-			HTML.OsVersion[idx]=OsVersion
-		else:
-			SSH.command('hostnamectl', '\$', 5)
-			result = re.search('Operating System: (?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', SSH.getBefore())
-			if result is not None:
-				OsVersion = result.group('os_type')
-				if OsVersion == 'CentOS Linux 7 ':
-					SSH.command('cat /etc/redhat-release', '\$', 5)
-					result = re.search('CentOS Linux release (?P<os_version>[0-9\.]+)', SSH.getBefore())
-					if result is not None:
-						OsVersion = OsVersion.replace('7 ', result.group('os_version'))
-				logging.debug('OS is: ' + OsVersion)
-				HTML.OsVersion[idx]=OsVersion
-		SSH.command('uname -r', '\$', 5)
-		result = re.search('uname -r\r\n(?P<kernel_version>[a-zA-Z0-9\-\_\.]+)', SSH.getBefore())
-		if result is not None:
-			KernelVersion = result.group('kernel_version')
-			logging.debug('Kernel Version is: ' + KernelVersion)
-			HTML.KernelVersion[idx]=KernelVersion
-		SSH.command('dpkg --list | egrep --color=never libuhd', '\$', 5)
-		result = re.search('libuhd.*:amd64 *(?P<uhd_version>[0-9\.]+)', SSH.getBefore())
-		if result is not None:
-			UhdVersion = result.group('uhd_version')
-			logging.debug('UHD Version is: ' + UhdVersion)
-			HTML.UhdVersion[idx]=UhdVersion
-		else:
-			SSH.command('uhd_config_info --abi-version', '\$', 5)
-			result = re.search('ABI version string: (?P<uhd_version>[a-zA-Z0-9\.\-]+)', SSH.getBefore())
-			if result is not None:
-				UhdVersion = result.group('uhd_version')
-				logging.debug('UHD Version is: ' + UhdVersion)
-				HTML.UhdVersion[idx]=UhdVersion
-		SSH.command('echo ' + Password + ' | sudo -S uhd_find_devices', '\$', 180)
-		usrp_boards = re.findall('product: ([0-9A-Za-z]+)', SSH.getBefore())
-		count = 0
-		for board in usrp_boards:
-			if count == 0:
-				UsrpBoard = board
-			else:
-				UsrpBoard += ',' + board
-			count += 1
-		if count > 0:
-			logging.debug('USRP Board(s) : ' + UsrpBoard)
-			HTML.UsrpBoard[idx]=UsrpBoard
-		SSH.command('lscpu', '\$', 5)
-		result = re.search('CPU\(s\): *(?P<nb_cpus>[0-9]+)', SSH.getBefore())
-		if result is not None:
-			CpuNb = result.group('nb_cpus')
-			logging.debug('nb_cpus: ' + CpuNb)
-			HTML.CpuNb[idx]=CpuNb
-		result = re.search('Model name: *(?P<model>[a-zA-Z0-9\-\_\.\ \(\)]+)', SSH.getBefore())
-		if result is not None:
-			CpuModel = result.group('model')
-			logging.debug('model: ' + CpuModel)
-			HTML.CpuModel[idx]=CpuModel
-		result = re.search('CPU MHz: *(?P<cpu_mhz>[0-9\.]+)', SSH.getBefore())
-		if result is not None:
-			CpuMHz = result.group('cpu_mhz') + ' MHz'
-			logging.debug('cpu_mhz: ' + CpuMHz)
-			HTML.CpuMHz[idx]=CpuMHz
-		SSH.close()
-
 	def ConditionalExit(self):
 		if self.testUnstable:
 			if self.testStabilityPointReached or self.testMinStableId == '999999':
diff --git a/ci-scripts/cls_physim.py b/ci-scripts/cls_physim.py
index 63aafd4d0a..a0264ac7c8 100644
--- a/ci-scripts/cls_physim.py
+++ b/ci-scripts/cls_physim.py
@@ -81,11 +81,7 @@ class PhySim:
 		#once parsed move the local logfile to its folder for tidiness
 		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
 
-		#updating the HTML with results
-		html_cell = '<pre style="background-color:white">' + info  + '</pre>'
-		html_queue=SimpleQueue()
-		html_queue.put(html_cell)
-		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
+		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
 		return HTML
 
 	def __CheckResults_LDPCt1Test(self,HTML,CONST,testcase_id):
@@ -106,24 +102,18 @@ class PhySim:
 		result = int(''.join(filter(str.isdigit, info)))/100
 		#once parsed move the local logfile to its folder for tidiness
 		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
-		#updating the HTML with results
-		html_cell = '<pre style="background-color:white">' + info + '</pre>'
-		html_queue=SimpleQueue()
-		html_queue.put(html_cell)
 		if result < thrs_NOK:
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
 		elif result > thrs_KO:
 			error_msg = f'Decoding time exceeds a limit of {thrs_KO} us'
 			logging.error(error_msg)
-			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
 			self.exitStatus = 1
 		else:
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'NOK', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'NOK', [info])
 		return HTML
 
 	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
-		html_queue = SimpleQueue()
 		#retrieve run log file and store it locally
 		mySSH = sshconnection.SSHConnection()
 		filename = self.__workSpacePath + self.__runLogFile
@@ -131,8 +121,7 @@ class PhySim:
 		if ret != 0:
 			error_msg = f'could not recover test result file {filename}'
 			logging.error(error_msg)
-			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
-			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', [error_msg])
 			self.exitStatus = 1
 			return HTML
 
@@ -145,13 +134,11 @@ class PhySim:
 
 		#updating the HTML with results
 		if PUSCH_OK:
-			html_queue.put('<pre style="background-color:white">succeeded</pre>')
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, ["succeeded"])
 		else:
 			error_msg = 'error: no "PUSCH test OK"'
 			logging.error(error_msg)
-			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, [error_msg])
 			self.exitStatus = 1
 		return HTML
 
diff --git a/ci-scripts/cls_static_code_analysis.py b/ci-scripts/cls_static_code_analysis.py
index ee3f1bbebf..37815321f3 100644
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -357,63 +357,43 @@ class StaticCodeAnalysis():
 				if nbFilesNotFormatted == 0:
 					HTML.CreateHtmlTestRow('File(s) Format', 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					html_queue = SimpleQueue()
-					html_cell = '<pre style="background-color:white">\n'
-					html_cell += 'Number of files not following OAI Rules: ' + str(nbFilesNotFormatted) + '\n'
+					html_cell = f'Number of files not following OAI Rules: {nbFilesNotFormatted}\n'
 					for nFile in listFilesNotFormatted:
 						html_cell += str(nFile).strip() + '\n'
-					html_cell += '</pre>'
-					html_queue.put(html_cell)
-					HTML.CreateHtmlTestRowQueue('File(s) Format', 'KO', 1, html_queue)
+					HTML.CreateHtmlTestRowQueue('File(s) Format', 'KO', [html_cell])
 					del(html_cell)
-					del(html_queue)
 
 				logging.debug('header files not respecting the circular dependency protection: ' + str(len(circularHeaderDependencyFiles)))
 				if len(circularHeaderDependencyFiles) == 0:
 					HTML.CreateHtmlTestRow('Header Circular Dependency', 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					html_queue = SimpleQueue()
-					html_cell = '<pre style="background-color:white">\n'
-					html_cell += 'Number of files not respecting: ' + str(len(circularHeaderDependencyFiles)) + '\n'
+					html_cell = f'Number of files not respecting: {len(circularHeaderDependencyFiles)}\n'
 					for nFile in circularHeaderDependencyFiles:
 						html_cell += str(nFile).strip() + '\n'
-					html_cell += '</pre>'
-					html_queue.put(html_cell)
-					HTML.CreateHtmlTestRowQueue('Header Circular Dependency', 'KO', 1, html_queue)
+					HTML.CreateHtmlTestRowQueue('Header Circular Dependency', 'KO', [html_cell])
 					del(html_cell)
-					del(html_queue)
 					finalStatus = -1
 
 				logging.debug('files with a GNU GPL license: ' + str(len(gnuGplLicenceFiles)))
 				if len(gnuGplLicenceFiles) == 0:
 					HTML.CreateHtmlTestRow('Files w/ GNU GPL License', 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					html_queue = SimpleQueue()
-					html_cell = '<pre style="background-color:white">\n'
-					html_cell += 'Number of files not respecting: ' + str(len(gnuGplLicenceFiles)) + '\n'
+					html_cell = f'Number of files not respecting: {len(gnuGplLicenceFiles)}\n'
 					for nFile in gnuGplLicenceFiles:
 						html_cell += str(nFile).strip() + '\n'
-					html_cell += '</pre>'
-					html_queue.put(html_cell)
-					HTML.CreateHtmlTestRowQueue('Files w/ GNU GPL License', 'KO', 1, html_queue)
+					HTML.CreateHtmlTestRowQueue('Files w/ GNU GPL License', 'KO', html_queue)
 					del(html_cell)
-					del(html_queue)
 					finalStatus = -1
 
 				logging.debug('files with a suspect license: ' + str(len(suspectLicenceFiles)))
 				if len(suspectLicenceFiles) == 0:
 					HTML.CreateHtmlTestRow('Files with suspect license', 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					html_queue = SimpleQueue()
-					html_cell = '<pre style="background-color:white">\n'
-					html_cell += 'Number of files not respecting: ' + str(len(suspectLicenceFiles)) + '\n'
+					html_cell = f'Number of files not respecting: {len(suspectLicenceFiles)}\n'
 					for nFile in suspectLicenceFiles:
 						html_cell += str(nFile).strip() + '\n'
-					html_cell += '</pre>'
-					html_queue.put(html_cell)
-					HTML.CreateHtmlTestRowQueue('Files with suspect license', 'KO', 1, html_queue)
+					HTML.CreateHtmlTestRowQueue('Files with suspect license', 'KO', [html_cell])
 					del(html_cell)
-					del(html_queue)
 					finalStatus = -1
 
 			else:
diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py
index 64074fdd6a..7483458ec3 100644
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -237,7 +237,7 @@ class EPCManagement():
 			sys.exit('Insufficient EPC Parameters')
 		mySSH = SSH.SSHConnection()
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		html_cell = '<pre style="background-color:white">\n'
+		html_cell = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
 			logging.debug('Using the SABOX simulated HSS')
 			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
@@ -288,11 +288,8 @@ class EPCManagement():
 					html_cell += '\n'
 		else:
 			logging.error('This option should not occur!')
-		html_cell += '</pre>'
 		mySSH.close()
-		html_queue = SimpleQueue()
-		html_queue.put(html_cell)
-		HTML.CreateHtmlTestRowQueue(self.Type, 'OK', 1, html_queue)
+		HTML.CreateHtmlTestRowQueue(self.Type, 'OK', [html_cell])
 
 	def SetAmfIPAddress(self):
 		# Not an error if we don't need an 5GCN
@@ -551,10 +548,7 @@ class EPCManagement():
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
-		html_queue = SimpleQueue()
-		html_cell = '<pre style="background-color:white">' + message + '</pre>'
-		html_queue.put(html_cell)
-		HTML.CreateHtmlTestRowQueue(self.Type, 'OK', 1, html_queue)
+		HTML.CreateHtmlTestRowQueue(self.Type, 'OK', [message])
 
 	def DeployEpc(self, HTML):
 		logging.debug('Trying to deploy')
@@ -644,7 +638,7 @@ class EPCManagement():
 			expectedHealthyContainers += 1
 
 		mySSH.command('docker-compose config | grep --colour=never image', '\$', 10)
-		html_cell = '<pre style="background-color:white">\n'
+		html_cell = ''
 		listOfImages = mySSH.getBefore()
 		for imageLine in listOfImages.split('\\r\\n'):
 			res1 = re.search('image: (?P<name>[a-zA-Z0-9\-]+):(?P<tag>[a-zA-Z0-9\-]+)', str(imageLine))
@@ -666,7 +660,6 @@ class EPCManagement():
 				if res4 is not None:
 					html_cell += '(' + res4.group('date') + ')'
 				html_cell += '\n'
-		html_cell += '</pre>'
 		# Checking if all are healthy
 		cnt = 0
 		while (cnt < 3):
@@ -682,8 +675,6 @@ class EPCManagement():
 		logging.debug(' -- ' + str(healthyNb) + ' healthy container(s)')
 		logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)')
 		logging.debug(' -- ' + str(startingNb) + ' still starting container(s)')
-		html_queue = SimpleQueue()
-		html_queue.put(html_cell)
 		if healthyNb == expectedHealthyContainers:
 			mySSH.command('docker exec -d prod-oai-hss /bin/bash -c "nohup tshark -i any -f \'port 9042 or port 3868\' -w /tmp/hss_check_run.pcap 2>&1 > /dev/null"', '\$', 5)
 			if self.isMagmaUsed:
@@ -695,11 +686,11 @@ class EPCManagement():
 			mySSH.command('docker exec -d prod-oai-spgwu-tiny /bin/bash -c "nohup tshark -i any -f \'port 8805\'  -w /tmp/spgwu_check_run.pcap 2>&1 > /dev/null"', '\$', 10)
 			mySSH.close()
 			logging.debug('Deployment OK')
-			HTML.CreateHtmlTestRowQueue(self.Type, 'OK', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.Type, 'OK', [html_cell])
 		else:
 			mySSH.close()
 			logging.debug('Deployment went wrong')
-			HTML.CreateHtmlTestRowQueue(self.Type, 'KO', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.Type, 'KO', [html_cell])
 
 	def UndeployEpc(self, HTML):
 		logging.debug('Trying to undeploy')
@@ -767,15 +758,12 @@ class EPCManagement():
 		mySSH.command('docker inspect --format=\'{{.Name}}\' prod-oai-public-net prod-oai-private-net', '\$', 10)
 		noMoreNetworkNb = mySSH.getBefore().count('No such object')
 		mySSH.close()
-		html_queue = SimpleQueue()
-		html_cell = '<pre style="background-color:white">' + message + '</pre>'
-		html_queue.put(html_cell)
 		if noMoreContainerNb == nbContainers and noMoreNetworkNb == 2:
 			logging.debug('Undeployment OK')
-			HTML.CreateHtmlTestRowQueue(self.Type, 'OK', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.Type, 'OK', [message])
 		else:
 			logging.debug('Undeployment went wrong')
-			HTML.CreateHtmlTestRowQueue(self.Type, 'KO', 1, html_queue)
+			HTML.CreateHtmlTestRowQueue(self.Type, 'KO', [message])
 
 	def LogCollectHSS(self):
 		mySSH = SSH.SSHConnection()
diff --git a/ci-scripts/helpreadme.py b/ci-scripts/helpreadme.py
index 4b58c77510..3a37876265 100644
--- a/ci-scripts/helpreadme.py
+++ b/ci-scripts/helpreadme.py
@@ -41,7 +41,7 @@ def GenericHelp(vers):
 	print('  --mode=[Mode]')
 	print('      TesteNB')
 	print('      InitiateHtml, FinalizeHtml')
-	print('      TerminateeNB, TerminateUE, TerminateHSS, TerminateMME, TerminateSPGW')
+	print('      TerminateeNB, TerminateHSS, TerminateMME, TerminateSPGW')
 	print('      LogCollectBuild, LogCollecteNB, LogCollectHSS, LogCollectMME, LogCollectSPGW, LogCollectPing, LogCollectIperf')
 
 def GitSrvHelp(repository,branch,commit,mergeallow,targetbranch):
@@ -70,11 +70,6 @@ def EPCSrvHelp(ipaddr, username, password, sourcepath, epctype):
 	print('  --EPCSourceCodePath=[EPC\'s Source Code Path]            -- ' + sourcepath)
 	print('  --EPCType=[EPC\'s Type: OAI or ltebox or OAI-Rel14-CUPS] -- ' + epctype)
 
-def ADBSrvHelp(ipaddr, username, password):
-	print('  --ADBIPAddress=[ADB\'s IP Address]                       -- ' + ipaddr)
-	print('  --ADBUserName=[ADB\'s Login User Name]                   -- ' + username)
-	print('  --ADBPassword=[ADB\'s Login Password]                    -- ' + password)
-
 def XmlHelp(filename):
 	print('  --XMLTestFile=[XML Test File to be run]                  -- ' + filename)
 	print('	Note: multiple xml files can be specified (--XMLFile=File1 ... --XMLTestFile=FileN) when HTML headers are created ("InitiateHtml" mode)')
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 813dc39a6a..7be8c594fd 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -40,10 +40,8 @@ import constants as CONST
 
 import cls_oaicitest            #main class for OAI CI test framework
 import cls_physim               #class PhySim for physical simulators build and test
-import cls_cots_ue              #class CotsUe for Airplane mode control
 import cls_containerize         #class Containerize for all container-based operations on RAN/UE objects
 import cls_static_code_analysis #class for static code analysis
-import cls_ci_ueinfra		        #class defining the multi Ue infrastrucure
 import cls_physim1          #class PhySim for physical simulators deploy and run
 import cls_cluster              # class for building/deploying on cluster
 
@@ -181,12 +179,10 @@ def GetParametersFromXML(action):
 			
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
-		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
 			RAN.air_interface[RAN.eNB_instance] = 'lte-softmodem'
-		elif (air_interface.lower() in ['nr','lte']):
+		else:
 			RAN.air_interface[RAN.eNB_instance] = air_interface.lower() +'-softmodem'
-		else :
-			RAN.air_interface[RAN.eNB_instance] = 'ocp-enb'
 
 		cmd_prefix = test.findtext('cmd_prefix')
 		if cmd_prefix is not None: RAN.cmd_prefix = cmd_prefix
@@ -213,54 +209,13 @@ def GetParametersFromXML(action):
 
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
-		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
 			RAN.air_interface[RAN.eNB_instance] = 'lte-softmodem'
-		elif (air_interface.lower() in ['nr','lte']):
+		else:
 			RAN.air_interface[RAN.eNB_instance] = air_interface.lower() +'-softmodem'
-		else :
-			RAN.air_interface[RAN.eNB_instance] = 'ocp-enb'
 
-	elif action == 'Initialize_UE':
-		ue_id = test.findtext('id')
-		CiTestObj.ue_trace=test.findtext('UE_Trace')#temporary variable, to be passed to Module_UE in Initialize_UE call
-		if (ue_id is None):
-			CiTestObj.ue_id = ""
-		else:
-			CiTestObj.ue_id = ue_id
-
-	elif action == 'Detach_UE':
-		ue_id = test.findtext('id')
-		if (ue_id is None):
-			CiTestObj.ue_id = ""
-		else:
-			CiTestObj.ue_id = ue_id
-
-	elif action == 'Attach_UE':
-		ue_id = test.findtext('id')
-		if (ue_id is None):
-			CiTestObj.ue_id = ""
-		else:
-			CiTestObj.ue_id = ue_id
-		nbMaxUEtoAttach = test.findtext('nbMaxUEtoAttach')
-		if (nbMaxUEtoAttach is None):
-			CiTestObj.nbMaxUEtoAttach = -1
-		else:
-			CiTestObj.nbMaxUEtoAttach = int(nbMaxUEtoAttach)
-
-	elif action == 'Terminate_UE':
-		ue_id = test.findtext('id')
-		if (ue_id is None):
-			CiTestObj.ue_id = ""
-		else:
-			CiTestObj.ue_id = ue_id
-
-
-	elif action == 'CheckStatusUE':
-		expectedNBUE = test.findtext('expectedNbOfConnectedUEs')
-		if (expectedNBUE is None):
-			CiTestObj.expectedNbOfConnectedUEs = -1
-		else:
-			CiTestObj.expectedNbOfConnectedUEs = int(expectedNBUE)
+	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
+		CiTestObj.ue_ids = test.findtext('id').split(' ')
 
 	elif action == 'Build_OAI_UE':
 		CiTestObj.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args')
@@ -280,12 +235,11 @@ def GetParametersFromXML(action):
 			
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
-		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
 			CiTestObj.air_interface = 'lte-uesoftmodem'
 		elif (air_interface.lower() in ['nr','lte']):
 			CiTestObj.air_interface = air_interface.lower() +'-uesoftmodem'
 		else :
-			#CiTestObj.air_interface = 'ocp-enb'
 			logging.error('OCP UE -- NOT SUPPORTED')
 
 		CiTestObj.cmd_prefix = test.findtext('cmd_prefix') or ""
@@ -299,58 +253,31 @@ def GetParametersFromXML(action):
 		
 		#local variable air_interface
 		air_interface = test.findtext('air_interface')		
-		if (air_interface is None) or (air_interface.lower() not in ['nr','lte','ocp']):
+		if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
 			CiTestObj.air_interface = 'lte-uesoftmodem'
-		elif (air_interface.lower() in ['nr','lte']):
+		else:
 			CiTestObj.air_interface = air_interface.lower() +'-uesoftmodem'
-		else :
-			#CiTestObj.air_interface = 'ocp-enb'
-			logging.error('OCP UE -- NOT SUPPORTED')
 
-	elif (action == 'Ping') or (action == 'Ping_CatM_module'):
+	elif action == 'Ping':
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
-		ue_id = test.findtext('id')
-		if (ue_id is None):
-			CiTestObj.ue_id = ""
-		else:
-			CiTestObj.ue_id = ue_id
-		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold')
-		if (ping_rttavg_threshold is None):
-			CiTestObj.ping_rttavg_threshold = ""
-		else:
-			CiTestObj.ping_rttavg_threshold = ping_rttavg_threshold
+		CiTestObj.ue_ids = test.findtext('id').split(' ')
+		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
 
 	elif action == 'Iperf':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
-		ue_id = test.findtext('id')
-		if (ue_id is None):
-			CiTestObj.ue_id = ""
-		else:
-			CiTestObj.ue_id = ue_id
-		CiTestObj.iperf_direction = test.findtext('direction')#used for modules only
+		CiTestObj.ue_ids = test.findtext('id').split(' ')
+		CiTestObj.iperf_direction = test.findtext('direction')
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
-		iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold')
-		if (iperf_bitrate_threshold is None):
-			CiTestObj.iperf_bitrate_threshold = "90" #if no threshold is specified, default will be 90%
-		else:
-			CiTestObj.iperf_bitrate_threshold = iperf_bitrate_threshold
-
-
-		CiTestObj.iperf_profile = test.findtext('iperf_profile')
-		if (CiTestObj.iperf_profile is None):
+		CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
+		CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
+		if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
+			logging.error(f'test-case has wrong profile {CiTestObj.iperf_profile}, forcing balanced')
 			CiTestObj.iperf_profile = 'balanced'
-		else:
-			if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
-				logging.error('test-case has wrong profile ' + CiTestObj.iperf_profile)
-				CiTestObj.iperf_profile = 'balanced'
-		CiTestObj.iperf_options = test.findtext('iperf_options')
-		if (CiTestObj.iperf_options is None):
+		CiTestObj.iperf_options = test.findtext('iperf_options') or 'check'
+		if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
+			logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
 			CiTestObj.iperf_options = 'check'
-		else:
-			if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
-				logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
-				CiTestObj.iperf_options = 'check'
 
 	elif action == 'IdleSleep':
 		string_field = test.findtext('idle_sleep_time_in_sec')
@@ -544,22 +471,6 @@ with open(yaml_file,'r') as f:
     #from YAML scalar values to Python dictionary format$
     xml_class_list = yaml.load(f,Loader=yaml.FullLoader)
 
-
-
-#loading UE infrastructure from yaml
-ue_infra_file='ci_ueinfra.yaml'
-if (os.path.isfile(ue_infra_file)):
-	yaml_file=ue_infra_file
-elif (os.path.isfile('ci-scripts/'+ue_infra_file)):
-	yaml_file='ci-scripts/'+ue_infra_file
-else:
-	logging.error("UE infrastructure yaml file cannot be found")
-	sys.exit("UE infrastructure file cannot be found")
-InfraUE=cls_ci_ueinfra.InfraUE() #initialize UE infrastructure class
-InfraUE.Get_UE_Infra(yaml_file) #read the UE infra, filename is hardcoded and unique for the moment but should be passed as parameter from the test suite
-
-
-
 mode = ''
 
 CiTestObj = cls_oaicitest.OaiCiTest()
@@ -592,15 +503,6 @@ py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj
 if py_param_file_present == True:
 	AssignParams(py_params)
 
-
-#-----------------------------------------------------------
-# COTS UE instanciation
-#-----------------------------------------------------------
-#COTS_UE instanciation and ADB server init
-#ue id and ue mode are retrieved from xml
-COTS_UE=cls_cots_ue.CotsUe(CiTestObj.ADBIPAddress, CiTestObj.ADBUserName,CiTestObj.ADBPassword)
-
-
 #-----------------------------------------------------------
 # mode amd XML class (action) analysis
 #-----------------------------------------------------------
@@ -616,18 +518,12 @@ if re.match('^TerminateeNB$', mode, re.IGNORECASE):
 	RAN.eNB_serverId[0]='0'
 	RAN.eNBSourceCodePath='/tmp/'
 	RAN.TerminateeNB(HTML, EPC)
-elif re.match('^TerminateUE$', mode, re.IGNORECASE):
-	if (CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == ''):
-		HELP.GenericHelp(CONST.Version)
-		sys.exit('Insufficient Parameter')
-	signal.signal(signal.SIGUSR1, receive_signal)
-	CiTestObj.TerminateUE(HTML,COTS_UE,InfraUE,CiTestObj.ue_trace)
 elif re.match('^TerminateOAIUE$', mode, re.IGNORECASE):
 	if CiTestObj.UEIPAddress == '' or CiTestObj.UEUserName == '' or CiTestObj.UEPassword == '':
 		HELP.GenericHelp(CONST.Version)
 		sys.exit('Insufficient Parameter')
 	signal.signal(signal.SIGUSR1, receive_signal)
-	CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
+	CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
 elif re.match('^TerminateHSS$', mode, re.IGNORECASE):
 	if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '':
 		HELP.GenericHelp(CONST.Version)
@@ -691,9 +587,6 @@ elif re.match('^LogCollectOAIUE$', mode, re.IGNORECASE):
 		sys.exit('Insufficient Parameter')
 	CiTestObj.LogCollectOAIUE()
 elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
-	if (CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == ''):
-		HELP.GenericHelp(CONST.Version)
-		sys.exit('Insufficient Parameter')
 	count = 0
 	foundCount = 0
 	while (count < HTML.nbTestXMLfiles):
@@ -713,28 +606,19 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
 	if foundCount != HTML.nbTestXMLfiles:
 		HTML.nbTestXMLfiles=foundCount
 	
-	if (CiTestObj.ADBIPAddress != 'none') and (CiTestObj.ADBIPAddress != 'modules'):
-		terminate_ue_flag = False
-		CiTestObj.GetAllUEDevices(terminate_ue_flag)
-		CiTestObj.GetAllCatMDevices(terminate_ue_flag)
-		HTML.SethtmlUEConnected(len(CiTestObj.UEDevices) + len(CiTestObj.CatMDevices))
-		HTML.htmlNb_Smartphones=len(CiTestObj.UEDevices)
-		HTML.htmlNb_CATM_Modules=len(CiTestObj.CatMDevices)
-	HTML.CreateHtmlHeader(CiTestObj.ADBIPAddress)
+	HTML.CreateHtmlHeader()
 elif re.match('^FinalizeHtml$', mode, re.IGNORECASE):
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	logging.info('\u001B[1m  Creating HTML footer \u001B[0m')
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 
-	CiTestObj.RetrieveSystemVersion('eNB',HTML,RAN)
-	CiTestObj.RetrieveSystemVersion('UE',HTML,RAN)
 	HTML.CreateHtmlFooter(CiTestObj.finalStatus)
 elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re.IGNORECASE):
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	logging.info('\u001B[1m  Starting Scenario: ' + CiTestObj.testXMLfiles[0] + '\u001B[0m')
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	if re.match('^TesteNB$', mode, re.IGNORECASE):
-		if RAN.eNBIPAddress == '' or RAN.ranRepository == '' or RAN.ranBranch == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '' or EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '' or CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == '':
+		if RAN.eNBIPAddress == '' or RAN.ranRepository == '' or RAN.ranBranch == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '' or EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.Type == '' or EPC.SourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)
 			if EPC.IPAddress == '' or EPC.UserName == '' or EPC.Password == '' or EPC.SourceCodePath == '' or EPC.Type == '':
 				HELP.EPCSrvHelp(EPC.IPAddress, EPC.UserName, EPC.Password, EPC.SourceCodePath, EPC.Type)
@@ -816,15 +700,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 
 	signal.signal(signal.SIGUSR1, receive_signal)
 
-	if (CiTestObj.ADBIPAddress != 'none') and (CiTestObj.ADBIPAddress != 'modules'):
-		terminate_ue_flag = False
-		CiTestObj.GetAllUEDevices(terminate_ue_flag)
-		CiTestObj.GetAllCatMDevices(terminate_ue_flag)
-	elif (CiTestObj.ADBIPAddress == 'modules'):
-		CiTestObj.UEDevices.append('COTS-Module')
-	else:
-		CiTestObj.UEDevices.append('OAI-UE')
-	HTML.SethtmlUEConnected(len(CiTestObj.UEDevices) + len(CiTestObj.CatMDevices))
 	HTML.CreateHtmlTabHeader()
 
 	# On CI bench w/ containers, we need to validate if IP routes are set
@@ -870,15 +745,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					continue
 				CiTestObj.ShowTestID()
 				GetParametersFromXML(action)
-				if action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Ping' or action == 'Iperf' or action == 'Reboot_UE' or action == 'DataDisable_UE' or action == 'DataEnable_UE' or action == 'CheckStatusUE':
-					if (CiTestObj.ADBIPAddress != 'none') and (CiTestObj.ADBIPAddress != 'modules'):
-						#in these cases, having no devices is critical, GetAllUEDevices function has to manage it as a critical error, reason why terminate_ue_flag is set to True
-						terminate_ue_flag = True 
-						# Now we stop properly the test-suite --> clean reporting
-						status = CiTestObj.GetAllUEDevices(terminate_ue_flag)
-						if not status:
-							RAN.prematureExit = True
-							break
 				if action == 'Build_eNB':
 					RAN.BuildeNB(HTML)
 				elif action == 'WaitEndBuild_eNB':
@@ -887,50 +753,35 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					logging.info(f"Executing custom command")
 					RAN.CustomCommand(HTML)
 				elif action == 'Initialize_eNB':
-					check_eNB = False
-					check_OAI_UE = False
-					RAN.pStatus=CiTestObj.CheckProcessExist(check_eNB, check_OAI_UE,RAN,EPC)
 					RAN.InitializeeNB(HTML, EPC)
 					if RAN.prematureExit:
 						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
 				elif action == 'Terminate_eNB':
 					RAN.TerminateeNB(HTML, EPC)
 				elif action == 'Initialize_UE':
-					CiTestObj.InitializeUE(HTML,RAN, EPC, COTS_UE, InfraUE, CiTestObj.ue_trace, CONTAINERS)
+					CiTestObj.InitializeUE(HTML)
 				elif action == 'Terminate_UE':
-					CiTestObj.TerminateUE(HTML,COTS_UE, InfraUE, CiTestObj.ue_trace)
+					CiTestObj.TerminateUE(HTML)
 				elif action == 'Attach_UE':
-					CiTestObj.AttachUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
+					CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
 				elif action == 'Detach_UE':
-					CiTestObj.DetachUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
+					CiTestObj.DetachUE(HTML)
 				elif action == 'DataDisable_UE':
 					CiTestObj.DataDisableUE(HTML)
 				elif action == 'DataEnable_UE':
 					CiTestObj.DataEnableUE(HTML)
 				elif action == 'CheckStatusUE':
-					CiTestObj.CheckStatusUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
+					CiTestObj.CheckStatusUE(HTML)
 				elif action == 'Build_OAI_UE':
 					CiTestObj.BuildOAIUE(HTML)
 				elif action == 'Initialize_OAI_UE':
-					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,COTS_UE,InfraUE,CONTAINERS)
+					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
 				elif action == 'Terminate_OAI_UE':
-					CiTestObj.TerminateOAIUE(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				elif action == 'Initialize_CatM_module':
-					CiTestObj.InitializeCatM(HTML)
-				elif action == 'Terminate_CatM_module':
-					CiTestObj.TerminateCatM(HTML)
-				elif action == 'Attach_CatM_module':
-					CiTestObj.AttachCatM(HTML,RAN,COTS_UE,EPC,InfraUE,CONTAINERS)
-				elif action == 'Detach_CatM_module':
-					CiTestObj.TerminateCatM(HTML)
-				elif action == 'Ping_CatM_module':
-					CiTestObj.PingCatM(HTML,RAN,EPC,COTS_UE,EPC,InfraUE,CONTAINERS)
+					CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
 				elif action == 'Ping':
-					CiTestObj.Ping(HTML,RAN,EPC,COTS_UE, InfraUE, CONTAINERS)
+					CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
 				elif action == 'Iperf':
-					CiTestObj.Iperf(HTML,RAN,EPC,COTS_UE, InfraUE, CONTAINERS)
-				elif action == 'Reboot_UE':
-					CiTestObj.RebootUE(HTML,RAN,EPC)
+					CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
 				elif action == 'Initialize_HSS':
 					EPC.InitializeHSS(HTML)
 				elif action == 'Terminate_HSS':
diff --git a/ci-scripts/py_params.yaml b/ci-scripts/py_params.yaml
index 303d5d1006..0c1d660ee8 100644
--- a/ci-scripts/py_params.yaml
+++ b/ci-scripts/py_params.yaml
@@ -38,11 +38,6 @@ EPCSourceCodePath : s
 EPCType : t
 EPCContainerPrefix : u
 
-ADBIPAddress : v
-ADBUserName : w
-ADBType : x
-ADBPassword : y
-
 XMLTestFile : z
 
 UEIPAddress : qqq
diff --git a/ci-scripts/py_params_template.yaml b/ci-scripts/py_params_template.yaml
index aaf31c1576..b6ef9c6892 100644
--- a/ci-scripts/py_params_template.yaml
+++ b/ci-scripts/py_params_template.yaml
@@ -69,13 +69,6 @@ EPC:
     EPCType : t
     EPCContainerPrefix : u
 
-ADB:
-  ADBIPAddress : v
-  ADBUserName : w
-  ADBType : x
-  ADBPassword : y
-
-
 UE:
   UE_inst_0:
     name : UE_1 
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index cb2546bc22..a8e66989c2 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -131,20 +131,16 @@ class RANManagement():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		
-		# Check if we build an 5G-NR gNB or an LTE eNB or an OCP eNB
-		result = re.search('--eNBocp', self.Build_eNB_args)
+		# Check if we build an 5G-NR gNB or an LTE eNB
+		result = re.search('--RU', self.Build_eNB_args)
 		if result is not None:
-			self.air_interface[self.eNB_instance] = 'ocp-enb'
+			self.air_interface[self.eNB_instance] = 'oairu'
 		else:
-			result = re.search('--RU', self.Build_eNB_args)
+			result = re.search('--gNB', self.Build_eNB_args)
 			if result is not None:
-				self.air_interface[self.eNB_instance] = 'oairu'
+				self.air_interface[self.eNB_instance] = 'nr-softmodem'
 			else:
-				result = re.search('--gNB', self.Build_eNB_args)
-				if result is not None:
-					self.air_interface[self.eNB_instance] = 'nr-softmodem'
-				else:
-					self.air_interface[self.eNB_instance] = 'lte-softmodem'
+				self.air_interface[self.eNB_instance] = 'lte-softmodem'
 		
 		# Worakround for some servers, we need to erase completely the workspace
 		if self.Build_eNB_forced_workspace_cleanup:
@@ -286,7 +282,7 @@ class RANManagement():
 		mySSH.command('ls ran_build/build', '\$', 3)
 		mySSH.command('ls ran_build/build', '\$', 3)
 
-		#check if we have the build corresponding to the air interface keywords (nr-softmode, lte-softmodem, ocp-enb)
+		#check if we have the build corresponding to the air interface keywords (nr-softmode, lte-softmodem)
 		logging.info('CHECK Build with IP='+lIpAddr+' SourcePath='+lSourcePath)
 		result = re.search(self.air_interface[self.eNB_instance], mySSH.getBefore())
 		if result is None:
@@ -365,14 +361,9 @@ class RANManagement():
 		cwd = os.getcwd()
 		mySSH.copyout(lIpAddr,lUserName,lPassWord, cwd + "/active_net_interfaces.awk", "/tmp")
 		
-		if (self.pStatus < 0):
-			HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' ' + self.Initialize_eNB_args, 'KO', self.pStatus)
-			HTML.CreateHtmlTabFooter(False)
-			sys.exit(1)
-
 		#Get pcap on enb and/or gnb if enabled in the xml 
 		if self.eNB_Trace=='yes':
-			if ((self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb')):
+			if self.air_interface[self.eNB_instance] == 'lte-softmodem':
 				pcapfile_prefix="enb_"
 			else:
 				pcapfile_prefix="gnb_"
@@ -457,7 +448,7 @@ class RANManagement():
 
 		#hack UHD_RFNOC_DIR variable for gNB / N310 on RHEL8 server:
 		#if the USRP address is in the xml then we are using an eth USRP (N3xx)
-		if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
+		if self.air_interface[self.eNB_instance] == 'lte-softmodem':
 			gNB = False
 		else:
 			gNB = True
@@ -473,7 +464,7 @@ class RANManagement():
 		monitor_file='../ci-scripts/stats_monitor.py'
 		conf_file='../ci-scripts/stats_monitor_conf.yaml'
 		if self.eNB_Stats=='yes':
-			if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
+			if self.air_interface[self.eNB_instance] == 'lte-softmodem':
 				mySSH.command('echo $USER; nohup python3 ' + monitor_file + ' ' + conf_file + ' ' + self.testCase_id + ' enb 2>&1 > enb_stats_monitor_execution.log &', '\$', 5)
 			else:
 				mySSH.command('echo $USER; nohup python3 ' + monitor_file + ' ' + conf_file + ' ' + self.testCase_id + ' gnb 2>&1 > gnb_stats_monitor_execution.log &', '\$', 5)
@@ -496,7 +487,7 @@ class RANManagement():
 					mySSH.command('killall --signal SIGKILL record', '\$', 5)
 				mySSH.close()
 				doLoop = False
-				logging.error('\u001B[1;37;41m eNB/gNB/ocp-eNB logging system did not show got sync! \u001B[0m')
+				logging.error('\u001B[1;37;41m eNB/gNB logging system did not show got sync! \u001B[0m')
 				HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' -O ' + config_file + extra_options, 'KO', CONST.ALL_PROCESSES_OK)
 				# In case of T tracer recording, we need to kill tshark on EPC side
 				localEpcIpAddr = EPC.IPAddress
@@ -553,7 +544,7 @@ class RANManagement():
 
 
 		HTML.CreateHtmlTestRow(f'{self.cmd_prefix} {self.air_interface[self.eNB_instance]} -O {config_file} {extra_options}', 'OK', CONST.ALL_PROCESSES_OK)
-		logging.debug('\u001B[1m Initialize eNB/gNB/ocp-eNB Completed\u001B[0m')
+		logging.debug('\u001B[1m Initialize eNB/gNB Completed\u001B[0m')
 
 	def CheckeNBProcess(self, status_queue):
 		try:
@@ -614,19 +605,19 @@ class RANManagement():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
-		if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
+		if self.air_interface[self.eNB_instance] == 'lte-softmodem':
 			nodeB_prefix = 'e'
 		else:
 			nodeB_prefix = 'g'
-		mySSH.command('stdbuf -o0  ps -aux | grep --color=never -e softmodem -e ocp-enb | grep -v grep', '\$', 5)
-		result = re.search('(-softmodem|ocp)', mySSH.getBefore())
+		mySSH.command('stdbuf -o0  ps -aux | grep --color=never -e softmodem | grep -v grep', '\$', 5)
+		result = re.search('-softmodem', mySSH.getBefore())
 		if result is not None:
-			mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGINT -r .*-softmodem ocp-enb || true', '\$', 5)
+			mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGINT -r .*-softmodem || true', '\$', 5)
 			time.sleep(10)
-			mySSH.command('stdbuf -o0  ps -aux | grep --color=never -e softmodem -e ocp-enb | grep -v grep', '\$', 5)
-			result = re.search('(-softmodem|ocp)', mySSH.getBefore())
+			mySSH.command('stdbuf -o0  ps -aux | grep --color=never -e softmodem | grep -v grep', '\$', 5)
+			result = re.search('-softmodem', mySSH.getBefore())
 			if result is not None:
-				mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGKILL -r .*-softmodem ocp-enb || true', '\$', 5)
+				mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGKILL -r .*-softmodem || true', '\$', 5)
 				time.sleep(5)
 		mySSH.command('rm -f my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		#stopping tshark (valid if eNB and enabled in xml, will not harm otherwise)
@@ -1088,7 +1079,7 @@ class RANManagement():
 
 		#post processing depending on the node type
 		if not nodeB_prefix_found:
-			if (self.air_interface[self.eNB_instance] == 'lte-softmodem') or (self.air_interface[self.eNB_instance] == 'ocp-enb'):
+			if self.air_interface[self.eNB_instance] == 'lte-softmodem':
 				nodeB_prefix = 'e'
 			else:
 				nodeB_prefix = 'g'
diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml
index 82cf7227d9..7388701a17 100755
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -20,7 +20,6 @@
   - CheckStatusUE
   - Ping
   - Iperf
-  - Reboot_UE
   - Deploy_EPC
   - Undeploy_EPC
   - Initialize_HSS
@@ -31,11 +30,6 @@
   - Terminate_SPGW
   - Initialize_5GCN
   - Terminate_5GCN
-  - Initialize_CatM_module
-  - Terminate_CatM_module
-  - Attach_CatM_module
-  - Detach_CatM_module
-  - Ping_CatM_module
   - IdleSleep
   - Perform_X2_Handover
   - Build_Image
diff --git a/ci-scripts/xml_files/benetel_multi_node_build.xml b/ci-scripts/xml_files/benetel_multi_node_build.xml
deleted file mode 100644
index 5ac28951b4..0000000000
--- a/ci-scripts/xml_files/benetel_multi_node_build.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 000001 000002
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>Build_eNB</class>
-		<desc>Build eNB</desc>
-		<Build_eNB_args>--eNB -t benetel4g -w None</Build_eNB_args>
-		<forced_workspace_cleanup>True</forced_workspace_cleanup>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-
-	<testCase id="000002">
-		<class>Build_eNB</class>
-		<desc>Build gNB</desc>
-		<Build_eNB_args>--gNB -t benetel5g -w None</Build_eNB_args>
-		<forced_workspace_cleanup>True</forced_workspace_cleanup>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-
-
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/benetel_nsa_quectel.xml b/ci-scripts/xml_files/benetel_nsa_quectel.xml
deleted file mode 100644
index 5da8322f22..0000000000
--- a/ci-scripts/xml_files/benetel_nsa_quectel.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
-	<htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030000
- 040000
- 000002
- 010000
- 050000
- 050001
- 000001
- 070000
- 000001
- 070001
- 000001
- 010002
- 000001
- 080001
- 080000
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize Quectel</desc>
-		<id>idefix</id>
-	</testCase>
-
-
-	<testCase id="010002">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-		<id>idefix</id>
-	</testCase>
-
-
-	<testCase id="030000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-4g.conf --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-	</testCase>
-
-
-	<testCase id="040000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-5g.conf -q --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-	</testCase>
-
-
-	<testCase id="050000">
-		<class>Ping</class>
-		<desc>Ping: 20pings in 20sec</desc>
-		<id>idefix</id>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="050001">
-		<class>Ping</class>
-		<desc>Ping: 100pings in 20sec</desc>
-		<id>idefix</id>
-		<ping_args>-c 100 -i 0.2</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="070000">
-		<class>Iperf</class>
-		<desc>iperf (DL/20Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 20M -t 60 -i 1</iperf_args>
-		<direction>DL</direction>
-		<id>idefix</id>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="070001">
-		<class>Iperf</class>
-		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 3M -t 60 -i 1</iperf_args>
-		<direction>UL</direction>
-		<id>idefix</id>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-
-	<testCase id="080000">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-	</testCase>
-
-	<testCase id="080001">
-		<class>Terminate_eNB</class>
-		<desc>Terminate gNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-</testCaseList>
-
diff --git a/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml b/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
deleted file mode 100644
index 3173e6315a..0000000000
--- a/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
-	<htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030000
- 040000
- 000002
- 010000
- 000001
- 050000
- 050001
- 000001
- 070000
- 000001
- 070001
- 000001
- 010002
- 000001
- 080001
- 080000
-  
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize Quectel</desc>
-		<id>idefix</id>
-	</testCase>
-
-
-	<testCase id="010002">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-		<id>idefix</id>
-	</testCase>
-
-
-	<testCase id="030000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-4g.conf --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-	</testCase>
-
-
-	<testCase id="040000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-5g.conf -q --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-	</testCase>
-
-
-	<testCase id="050000">
-		<class>Ping</class>
-		<desc>Ping: 20pings in 20sec</desc>
-		<id>idefix</id>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="050001">
-		<class>Ping</class>
-		<desc>Ping: 100pings in 20sec</desc>
-		<id>idefix</id>
-		<ping_args>-c 100 -i 0.2</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="070000">
-		<class>Iperf</class>
-		<desc>iperf (DL/20Mbps/UDP)(20 min)(single-ue profile)</desc>
-		<iperf_args>-u -b 20M -t 1200 -i 1</iperf_args>
-		<direction>DL</direction>
-		<id>idefix</id>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="070001">
-		<class>Iperf</class>
-		<desc>iperf (UL/3Mbps/UDP)(20 min)(single-ue profile)</desc>
-		<iperf_args>-u -b 2M -t 1200 -i 1</iperf_args>
-		<direction>UL</direction>
-		<id>idefix</id>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-
-	<testCase id="080000">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-	</testCase>
-
-	<testCase id="080001">
-		<class>Terminate_eNB</class>
-		<desc>Terminate gNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-</testCaseList>
-
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
index 698c620329..0023edd171 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
@@ -30,10 +30,9 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
 100000
 111110
 300000
-040101
+040101 
 030101
-000001
-040301 000001 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
+040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
 030201
 200000
     </TestCaseRequestedList>
@@ -45,24 +44,26 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <test_svr_id>0</test_svr_id>
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
+
     <testCase id="100000">
-	    <class>Custom_Command</class>
-	    <desc>To reset cpupower</desc>
-	    <node>hutch</node>
-	    <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-	    <class>Custom_Command</class>
-	    <desc>To reset cpupower</desc>
-	    <node>hutch</node>
-	    <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
-   <testCase id="300000">
-	    <class>Custom_Command</class>
-	    <desc>To reset USRP</desc>
-	    <node>hutch</node>
-	    <command>sudo -S b2xx_fx3_utils --reset-device</command>
-   </testCase>
+    <testCase id="300000">
+        <class>Custom_Command</class>
+        <desc>Reset USRP</desc>
+        <node>hutch</node>
+        <command>sudo -S b2xx_fx3_utils --reset-device</command>
+    </testCase>
+
     <testCase id="030101">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
@@ -88,21 +89,22 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
-        <desc>Attach UE</desc>
+        <desc>Attach UEs</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
-        <desc>Detach UE</desc>
+        <desc>Detach UEs</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040501">
@@ -110,6 +112,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040603">
@@ -117,7 +120,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
         <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040604">
@@ -125,7 +129,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
         <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040605">
@@ -134,6 +139,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040606">
@@ -142,6 +149,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_2</id>
     </testCase>
 
     <testCase id="040607">
@@ -150,38 +159,48 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040642">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040644">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
index 66d0c982ec..bf8cb5e256 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
@@ -44,16 +44,16 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
     <testCase id="100000">
-	    <class>Custom_Command</class>
-	    <desc>To reset cpupower</desc>
-	    <node>hutch</node>
-	    <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-	    <class>Custom_Command</class>
-	    <desc>To reset cpupower</desc>
-	    <node>hutch</node>
-	    <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
 
     <testCase id="030102">
@@ -75,21 +75,22 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="000001">
@@ -108,34 +109,40 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <class>CheckStatusUE</class>
         <desc>Check UE(s) status before attachment</desc>
         <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="000011">
         <class>CheckStatusUE</class>
         <desc>Check UE(s) status before data disabling</desc>
         <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="000012">
         <class>CheckStatusUE</class>
         <desc>Check UE(s) status after data disabling</desc>
         <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="000013">
         <class>CheckStatusUE</class>
         <desc>Check UE(s) status after data re-enabling</desc>
         <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040302">
         <class>DataDisable_UE</class>
         <desc>Disabling Data Service on UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040303">
         <class>DataEnable_UE</class>
         <desc>Enabling Data Service on UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040502">
@@ -143,6 +150,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040503">
@@ -150,6 +158,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
index 07f23ff2f0..ea89f4193a 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -46,16 +46,16 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
     <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>hutch</node>
-            <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>hutch</node>
-            <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>hutch</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
 
     <testCase id="030111">
@@ -83,21 +83,22 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040511">
@@ -105,6 +106,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>ping (10MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040613">
@@ -113,6 +115,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040614">
@@ -121,6 +125,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040615">
@@ -129,6 +135,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040616">
@@ -137,6 +145,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040617">
@@ -145,38 +155,48 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040651">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 18M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040652">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 18M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040653">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040654">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
index caa888e4a8..788a1759dc 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
@@ -31,7 +31,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 111110
 040101
 030112
-040301 040512 040612 040650 040401 040201
+040301 040302 040512 040612 040650 040401
+040201
 030201
 200000
     </TestCaseRequestedList>
@@ -45,13 +46,13 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     </testCase>
     <testCase id="100000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Disable Sleep States</desc>
             <node>hutch</node>
             <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Enable Sleep States</desc>
             <node>hutch</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
@@ -75,21 +76,22 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040512">
@@ -97,6 +99,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>ping (10MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040612">
@@ -105,14 +108,18 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040650">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 20M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
index e57e40cb1f..4fef927a3b 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -46,13 +46,13 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     </testCase>
     <testCase id="100000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Disable Sleep States</desc>
             <node>hutch</node>
             <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Enable Sleep States</desc>
             <node>hutch</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
@@ -82,21 +82,22 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040521">
@@ -104,6 +105,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>ping (20MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040623">
@@ -112,6 +114,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040624">
@@ -120,6 +124,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040625">
@@ -128,6 +134,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040626">
@@ -136,6 +144,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040627">
@@ -144,38 +154,48 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040661">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 12M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 12M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040662">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 17M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 17M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040663">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040664">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
index 9f3bedba9e..3f12ed8330 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -43,17 +43,18 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <test_svr_id>0</test_svr_id>
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
+
     <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
 
     <testCase id="030104">
@@ -81,21 +82,22 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040501">
@@ -103,6 +105,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040601">
@@ -111,6 +114,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040602">
@@ -119,6 +124,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040603">
@@ -127,6 +134,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040604">
@@ -135,6 +144,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040605">
@@ -142,45 +153,57 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040642">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040644">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040645">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
index d8f87b4741..887b5dab9b 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
@@ -45,13 +45,13 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
     </testCase>
     <testCase id="100000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Disable Sleep States</desc>
             <node>starsky</node>
             <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Enable Sleep States</desc>
             <node>starsky</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
@@ -80,21 +80,22 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040502">
@@ -102,6 +103,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <desc>ping (5MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040601">
@@ -110,6 +112,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040606">
@@ -118,6 +122,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040603">
@@ -126,6 +132,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040608">
@@ -134,6 +142,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040605">
@@ -141,45 +151,57 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
         <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040646">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040648">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040645">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
index fe47e7c958..3874ff7028 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -44,16 +44,16 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
     <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
     <testCase id="030114">
         <class>Deploy_Object</class>
@@ -80,21 +80,22 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040511">
@@ -102,6 +103,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <desc>ping (10MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040611">
@@ -110,6 +112,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040612">
@@ -118,6 +122,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040613">
@@ -126,6 +132,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040614">
@@ -134,6 +142,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040615">
@@ -141,45 +151,57 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040651">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040652">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040653">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040654">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040655">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
index 51c4f95137..77e00d72ac 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
@@ -45,13 +45,13 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     </testCase>
     <testCase id="100000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Disable Sleep States</desc>
             <node>starsky</node>
             <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
             <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
+            <desc>Enable Sleep States</desc>
             <node>starsky</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
@@ -80,21 +80,22 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040521">
@@ -102,6 +103,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <desc>ping (20MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040621">
@@ -110,6 +112,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040622">
@@ -118,6 +122,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040623">
@@ -126,6 +132,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040624">
@@ -134,6 +142,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040625">
@@ -141,45 +151,57 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040661">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040662">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040663">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040664">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040665">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
index 57ebb79fac..fd454f13e2 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
@@ -43,18 +43,20 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <test_svr_id>0</test_svr_id>
         <images_to_pull>oai-enb</images_to_pull>
     </testCase>
+
     <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -D 0</command>
+        <class>Custom_Command</class>
+        <desc>Disable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -D 0</command>
     </testCase>
     <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>starsky</node>
-            <command>sudo cpupower idle-set -E</command>
+        <class>Custom_Command</class>
+        <desc>Enable Sleep States</desc>
+        <node>starsky</node>
+        <command>sudo cpupower idle-set -E</command>
     </testCase>
+
     <testCase id="030125">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
@@ -80,21 +82,22 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <testCase id="040101">
         <class>Initialize_UE</class>
         <desc>Initialize UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040201">
         <class>Terminate_UE</class>
         <desc>Terminate UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040301">
         <class>Attach_UE</class>
         <desc>Attach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
-
     <testCase id="040401">
         <class>Detach_UE</class>
         <desc>Detach UE</desc>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040522">
@@ -102,6 +105,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <desc>ping (20MHz - 20 sec)</desc>
         <ping_args>-c 20</ping_args>
         <ping_packetloss_threshold>25</ping_packetloss_threshold>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040626">
@@ -110,6 +114,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040627">
@@ -118,6 +124,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040628">
@@ -126,6 +134,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040629">
@@ -134,6 +144,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040630">
@@ -141,45 +153,57 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
         <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040666">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040667">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040668">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040669">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
+        <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040670">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
+        <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
index 397e6aadbd..2f0c8dfeda 100644
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -31,14 +31,10 @@
  500000
  111110
  111111
- 000001
- 010002
- 030101
- 000001
- 030102
- 000001
  010000
- 000001
+ 030101
+ 030102
+ 010001
  050000
  050001
  070001
@@ -46,8 +42,8 @@
  070002
  050002
  050003
+ 010010
  010002
- 000001
  030202
  030201
  300000
@@ -69,47 +65,58 @@
 		<images_to_pull>oai-gnb</images_to_pull>
 	</testCase>
 
+	<testCase id = "100000">
+		<class>Custom_Command</class>
+		<desc>Reset USRP</desc>
+		<node>nepes</node>
+		<command>sudo -S b2xx_fx3_utils --reset-device</command>
+  </testCase>
+
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (nepes)</desc>
+		<node>nepes</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="300000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (nepes)</desc>
+		<node>nepes</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+	<testCase id="500000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="600000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>idefix</id>
 	</testCase>
-        <testCase id = "100000">
-		<class>Custom_Command</class>
-		<desc>To reset USRP</desc>
-		<node>nepes</node>
-		<command>sudo -S b2xx_fx3_utils --reset-device</command>
-        </testCase>
-       <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -D 0</command>
-       </testCase>
-       <testCase id="300000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -E</command>
-       </testCase>
-       <testCase id="500000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-       </testCase>
-       <testCase id="600000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -E</command>
-       </testCase>
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>idefix</id>
 	</testCase>
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+		<id>idefix</id>
+  </testCase>
+	<testCase id= "010010">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+		<id>idefix</id>
+	</testCase>
 
 	<testCase id="030101">
 		<class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml
index 4f0e01c692..ed0b27080b 100644
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -28,25 +28,19 @@
   <TestCaseRequestedList>
     100000
     111111
-    010002
-    030101
-    000001
     010000
-    000001
+    030101
+    010001
     050000
     050001
-    070001
     070000
+    070001
+    070002
+    010010
     010002
-    000001
     030201
     200000
   </TestCaseRequestedList>
-    <!--
- 070002
- 050002
- 050003
-    -->
   <TestCaseExclusionList></TestCaseExclusionList>
 
   <testCase id="111111">
@@ -56,30 +50,40 @@
     <images_to_pull>oai-gnb</images_to_pull>
   </testCase>
 
+  <testCase id="100000">
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+  <testCase id="200000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
   <testCase id="010000">
     <class>Initialize_UE</class>
     <desc>Initialize Quectel</desc>
     <id>idefix</id>
   </testCase>
-
-
   <testCase id="010002">
     <class>Terminate_UE</class>
     <desc>Terminate Quectel</desc>
     <id>idefix</id>
   </testCase>
-  <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -D 0</command>
-   </testCase>
-   <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -E</command>
+  <testCase id="010001">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>idefix</id>
   </testCase>
+  <testCase id="010010">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
   <testCase id="030101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
@@ -119,28 +123,10 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="050002">
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>idefix</id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="050003">
-    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>idefix</id>
-    <ping_args>-c 100 -i 0.2</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
   <testCase id="070000">
     <class>Iperf</class>
     <desc>iperf (DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 30M -t 30 -i 1 -fm -l1400</iperf_args>
+    <iperf_args>-u -b 30M -t 30 -i 1 -fm</iperf_args>
     <direction>DL</direction>
     <id>idefix</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -151,7 +137,7 @@
   <testCase id="070001">
     <class>Iperf</class>
     <desc>iperf (UL/8Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 8M -t 30 -i 1 -fm -l1400</iperf_args>
+    <iperf_args>-u -b 8M -t 30 -i 1 -fm</iperf_args>
     <direction>UL</direction>
     <id>idefix</id>
     <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
index 45a05375ca..2f6aad7eef 100644
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -32,9 +32,11 @@
     130102
     100001
     110000
+    110001
     100001
     150000
     150001
+    110011
     110002
     100001
     130201
@@ -54,13 +56,21 @@
     <desc>Initialize Quectel</desc>
     <id>idefix</id>
   </testCase>
-
-
   <testCase id="110002">
     <class>Terminate_UE</class>
     <desc>Terminate Quectel</desc>
     <id>idefix</id>
   </testCase>
+  <testCase id="110001">
+    <class>Attach_UE</class>
+    <desc>Attach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="110011">
+    <class>Detach_UE</class>
+    <desc>Detach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
 
   <testCase id="130101">
     <class>Deploy_Object</class>
@@ -79,18 +89,20 @@
     <eNB_serverId>0</eNB_serverId>
     <services>gnb_du_tdd</services>
   </testCase>
+
   <testCase id="100000">
     <class>Custom_Command</class>
-    <desc>To reset cpupower</desc>
+    <desc>Disable Sleep States</desc>
     <node>nepes</node>
     <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-      <class>Custom_Command</class>
-      <desc>To reset cpupower</desc>
-      <node>nepes</node>
-      <command>sudo cpupower idle-set -E</command>
-    </testCase>
+  </testCase>
+  <testCase id="200000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
   <testCase id="100001">
     <class>IdleSleep</class>
     <desc>Sleep</desc>
@@ -103,7 +115,6 @@
     <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
   </testCase>
 
-
   <testCase id="150000">
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
diff --git a/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
deleted file mode 100644
index eebe62b3b5..0000000000
--- a/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize OCP-eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<air_interface>ocp</air_interface>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate OCP-eNB</desc>
-		<air_interface>ocp</air_interface>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040501">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040604">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040606">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040607">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040644">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ocp_usrp210_build.xml b/ci-scripts/xml_files/enb_ocp_usrp210_build.xml
deleted file mode 100644
index 33a0fc205e..0000000000
--- a/ci-scripts/xml_files/enb_ocp_usrp210_build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB OCP (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNBocp --ninja</Build_eNB_args>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml
deleted file mode 100644
index bfaaceaa2d..0000000000
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_closure.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_closure.xml
deleted file mode 100644
index 8587db959d..0000000000
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_closure.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_start.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_start.xml
deleted file mode 100644
index aac71198f1..0000000000
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_epc_start.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-start</htmlTabRef>
-	<htmlTabName>EPC-Start</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-	</testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
deleted file mode 100644
index 723956fe60..0000000000
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201 090109
- 030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000003">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="090101">
-		<class>Initialize_OAI_UE</class>
-		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
-		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
-	</testCase>
-
-	<testCase id="090109">
-		<class>Terminate_OAI_UE</class>
-		<desc>Terminate OAI UE</desc>
-	</testCase>
-
-	<testCase id="040501">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)(from eNB to OAI UE)</desc>
-		<ping_args>-I oaitun_enb1 -c 20 10.0.1.2</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040502">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)(from OAI UE to eNB)</desc>
-		<ping_args>-I oaitun_ue1 -c 20 10.0.1.1</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040602">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/14Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.2 -u -b 14M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.1 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.1 -u -b 4M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml
deleted file mode 100644
index cf090379df..0000000000
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1-fembms-nos1-tunnel</htmlTabRef>
-	<htmlTabName>Test-05MHz-FEMBMS-TM1-noS1-tunnel</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201 090109
- 030104 000001 090104 000002 040605 000001 090109 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000003">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030104">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz/MBMS)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --nokrnmod 1 --eNBs.[0].component_carriers.[0].eutra_band 7 --eNBs.[0].component_carriers.[0].downlink_frequency 2680000000 --eNBs.[0].component_carriers.[0].uplink_frequency_offset -120000000 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --MCEs.[0].mbms_sched_info.mbms_area_config_list.[0].pmch_config_list.[0].allocated_sf_end 512 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="090104">
-		<class>Initialize_OAI_UE</class>
-		<desc>Initialize OAI UE (FDD/Band7/5MHz/MBMS)</desc>
-		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
-	</testCase>
-
-	<testCase id="090109">
-		<class>Terminate_OAI_UE</class>
-		<desc>Terminate OAI UE</desc>
-	</testCase>
-
-	<testCase id="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1.5Mbps/UDP/MBMS-sink)(20 sec)</desc>
-		<iperf_args>-c 10.0.2.2 -u -b 1.5M -t 20 -i 1 -fm -B 10.0.2.1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_options>sink</iperf_options>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml
deleted file mode 100644
index c778b43eb5..0000000000
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1-mbms-nos1-tunnel</htmlTabRef>
-	<htmlTabName>Test-05MHz-MBMS-TM1-noS1-tunnel</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201 090109
- 030103 000001 090103 000002 040605 000001 090109 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000003">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030103">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz/MBMS)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --nokrnmod 1 --eNBs.[0].component_carriers.[0].eutra_band 7 --eNBs.[0].component_carriers.[0].downlink_frequency 2680000000 --eNBs.[0].component_carriers.[0].uplink_frequency_offset -120000000 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="090103">
-		<class>Initialize_OAI_UE</class>
-		<desc>Initialize OAI UE (FDD/Band7/5MHz/MBMS)</desc>
-		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --noS1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
-	</testCase>
-
-	<testCase id="090109">
-		<class>Terminate_OAI_UE</class>
-		<desc>Terminate OAI UE</desc>
-	</testCase>
-
-	<testCase id="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1.5Mbps/UDP/MBMS-sink)(20 sec)</desc>
-		<iperf_args>-c 10.0.2.2 -u -b 1.5M -t 20 -i 1 -fm -B 10.0.2.1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_options>sink</iperf_options>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
deleted file mode 100644
index 07e3a4135a..0000000000
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1-tunnel</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1-tunnel</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201 090109
- 030102 000001 090102 000002 040503 000001 040603 040604 040643 040644 000001 090109 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030102">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="090102">
-		<class>Initialize_OAI_UE</class>
-		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
-		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --nokrnmod 1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
-	</testCase>
-
-	<testCase id="090109">
-		<class>Terminate_OAI_UE</class>
-		<desc>Terminate OAI UE</desc>
-	</testCase>
-
-	<testCase id="040503">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040604">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/14Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 14M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040644">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/4Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 4M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml
deleted file mode 100644
index d73a1e26e9..0000000000
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_ue_build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>oai-ue-build-tab</htmlTabRef>
-	<htmlTabName>OAI-UE-Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
-090101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="090101">
-		<class>Build_OAI_UE</class>
-		<desc>Build OAI UE</desc>
-		<Build_OAI_UE_args>-w USRP --UE --ninja</Build_OAI_UE_args>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band13_build.xml b/ci-scripts/xml_files/enb_usrp210_band13_build.xml
deleted file mode 100644
index 53066573c8..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band13_build.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band13_epc_closure.xml b/ci-scripts/xml_files/enb_usrp210_band13_epc_closure.xml
deleted file mode 100644
index e52faa7a31..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band13_epc_closure.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 040202
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="040202">
-		<class>Terminate_CatM_module</class>
-		<desc>Terminate CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml b/ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml
deleted file mode 100644
index 0a788cb614..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band13_epc_start.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-start-tab</htmlTabRef>
-	<htmlTabName>EPC-Start</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-	</testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
deleted file mode 100644
index c050b38b12..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-lte-m-10-tm1</htmlTabRef>
-	<htmlTabName>Test-LTE-M-10MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestUnstable>True</TestUnstable>
-	<TestCaseRequestedList>
- 030201
- 040102
- 030121 000001 040302 000001 040502 000001 040402 040202 000001 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Waiting for a moment...</desc>
-		<idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030121">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band13/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040102">
-		<class>Initialize_CatM_module</class>
-		<desc>Initialize CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040202">
-		<class>Terminate_CatM_module</class>
-		<desc>Terminate CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040302">
-		<class>Attach_CatM_module</class>
-		<desc>Attach CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040402">
-		<class>Detach_CatM_module</class>
-		<desc>Detach CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040502">
-		<class>Ping_CatM_module</class>
-		<desc>ping (10MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_build.xml b/ci-scripts/xml_files/enb_usrp210_band40_build.xml
deleted file mode 100644
index bfaaceaa2d..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band40_build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_epc_closure.xml b/ci-scripts/xml_files/enb_usrp210_band40_epc_closure.xml
deleted file mode 100644
index 07fb6951f8..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band40_epc_closure.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_epc_start.xml b/ci-scripts/xml_files/enb_usrp210_band40_epc_start.xml
deleted file mode 100644
index 354cff346e..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band40_epc_start.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-start-tab</htmlTabRef>
-	<htmlTabName>EPC-Start</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-	</testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_tracer.xml b/ci-scripts/xml_files/enb_usrp210_band40_tracer.xml
deleted file mode 100644
index d8793b63e6..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band40_tracer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>tracer-test</htmlTabRef>
-	<htmlTabName>T-Tracer</htmlTabName>
-	<htmlTabIcon>duplicate</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030100 040300 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030100">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (TDD/Band40/5MHz) with T Tracer on</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf --T_stdout 0 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040300">
-		<class>Attach_UE</class>
-		<desc>Attach single UE</desc>
-		<nbMaxUEtoAttach>1</nbMaxUEtoAttach>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml
deleted file mode 100644
index fdf20e5e91..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1-rrc-w-flex</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1-RRC-Inactivity</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 050102
- 030103 000020 040301 040504 000021 040302 000001 000022 040303 000002 040505 000023 040401 040201 030201
- 050202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Waiting for 55 seconds</desc>
-		<idle_sleep_time_in_sec>55</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Waiting for 10 seconds</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000020">
-		<class>CheckStatusUE</class>
-		<desc>Check UE(s) status before attachment</desc>
-		<expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-	</testCase>
-
-	<testCase id="000021">
-		<class>CheckStatusUE</class>
-		<desc>Check UE(s) status before data disabling</desc>
-		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
-	</testCase>
-
-	<testCase id="000022">
-		<class>CheckStatusUE</class>
-		<desc>Check UE(s) status after data disabling</desc>
-		<expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-	</testCase>
-
-	<testCase id="000023">
-		<class>CheckStatusUE</class>
-		<desc>Check UE(s) status after data re-enabling</desc>
-		<expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
-	</testCase>
-
-	<testCase id="030103">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz) for RRC Inactivity Timer testing</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040302">
-		<class>DataDisable_UE</class>
-		<desc>Disabling Data Service on UE</desc>
-	</testCase>
-
-	<testCase id="040303">
-		<class>DataEnable_UE</class>
-		<desc>Enabling Data Service on UE</desc>
-	</testCase>
-
-	<testCase id="040504">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040505">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/enb_usrp210_band7_tracer.xml b/ci-scripts/xml_files/enb_usrp210_band7_tracer.xml
deleted file mode 100644
index e63f02ba3d..0000000000
--- a/ci-scripts/xml_files/enb_usrp210_band7_tracer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>tracer-test</htmlTabRef>
-	<htmlTabName>T-Tracer</htmlTabName>
-	<htmlTabIcon>duplicate</htmlTabIcon>
-	<TestCaseRequestedList>
- 040101
- 030100 040300 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030100">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz) with T Tracer on</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --T_stdout 0</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040300">
-		<class>Attach_UE</class>
-		<desc>Attach single UE</desc>
-		<nbMaxUEtoAttach>1</nbMaxUEtoAttach>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
index f3009f150f..185d637218 100644
--- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
+++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
@@ -33,7 +33,7 @@
  030000
  040000
  000002
- 010000
+ 010000 010010
  000001
  050000
  050001
@@ -42,7 +42,7 @@
  070001
  070002
  000001
- 010002
+ 010011 010002
  080001
  080000
  200000
@@ -50,43 +50,51 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+	<testCase id="700000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (asterix)</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="800000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (asterix)</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-        <testCase id="700000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - asterix</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="800000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - asterix</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
+	<testCase id="010010">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 
 
 	<testCase id="030000">
diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
index d88eebaf91..d1515898ff 100644
--- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
+++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
@@ -60,53 +60,47 @@
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-
 	<testCase id="010003">
 		<class>Attach_UE</class>
 		<desc>Attach Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-
 	<testCase id="010004">
 		<class>Detach_UE</class>
 		<desc>Detach Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>	
 
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - asterix</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - asterix</desc>
-	    <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-        <testCase id="300000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="400000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-	    <node>obelix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-
+  <testCase id="100000">
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (asterix)</desc>
+    <node>asterix</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+  <testCase id="200000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States (asterix)</desc>
+    <node>asterix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+  <testCase id="300000">
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (obelix)</desc>
+    <node>obelix</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+  <testCase id="400000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States (obelix)</desc>
+    <node>obelix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
 
 	<testCase id="031000">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/fr1_nsa_base.xml b/ci-scripts/xml_files/fr1_nsa_base.xml
deleted file mode 100644
index dec24f7d93..0000000000
--- a/ci-scripts/xml_files/fr1_nsa_base.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
-	<htmlTabName>NSA FULL</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 010000
- 030000
- 040000
- 010001
- 000001
- 050000
- 050001
- 000001
- 060000
- 060001
- 000001
- 070000
- 070001
- 010002
- 000001
- 080001
- 080000
- 010003
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="010003">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="010001">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="010002">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-
-	<testCase id="030000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-   </testCase>
-
-
-	<testCase id="040000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf -E --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="050000">
-		<class>Ping</class>
-		<desc>Ping: 20pings in 20sec</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="050001">
-		<class>Ping</class>
-		<desc>Ping: 100pings in 20sec</desc>
-		<ping_args>-c 100 -i 0.2</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-
-	<testCase id="060000">
-		<class>Iperf</class>
-		<desc>iperf (DL/2.5Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 2.5M -t 60 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="060001">
-		<class>Iperf</class>
-		<desc>iperf (UL/1.5Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 1.5M -t 60 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-
-	<testCase id="070000">
-		<class>Iperf</class>
-		<desc>iperf (DL/20Mbps/UDP)(20 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 20M -t 20 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="070001">
-		<class>Iperf</class>
-		<desc>iperf (UL/3Mbps/UDP)(20 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 3M -t 20 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-
-
-	<testCase id="080000">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-	</testCase>
-
-	<testCase id="080001">
-		<class>Terminate_eNB</class>
-		<desc>Terminate gNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-</testCaseList>
-
diff --git a/ci-scripts/xml_files/fr1_nsa_quectel.xml b/ci-scripts/xml_files/fr1_nsa_quectel.xml
index 1087d8e6b5..962b3eef7e 100644
--- a/ci-scripts/xml_files/fr1_nsa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_nsa_quectel.xml
@@ -33,7 +33,8 @@
  030000
  040000
  000002
- 010000
+ 010000 
+ 010010
  000001
  050000
  050001
@@ -43,6 +44,7 @@
  000001
  050000
  050001
+ 010011
  010002
  080001
  080000
@@ -51,12 +53,6 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="010000">
-		<class>Initialize_UE</class>
-		<desc>Initialize Quectel</desc>
-		<id>idefix</id>
-		<UE_Trace>yes</UE_Trace>
-	</testCase>
 	<testCase id="100000">
 		<class>Custom_Command</class>
 		<desc>To reset USRP</desc>
@@ -64,35 +60,51 @@
 		<command>sudo -S b2xx_fx3_utils --reset-device</command>
 	</testCase>
 
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="300000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (obelix)</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+	<testCase id="400000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States (nepes)</desc>
+		<node>nepes</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="500000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States (nepes)</desc>
+		<node>nepes</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
+	<testCase id="010000">
+		<class>Initialize_UE</class>
+		<desc>Initialize Quectel</desc>
+		<id>idefix</id>
+	</testCase>
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>idefix</id>
 	</testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="300000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - obelix</desc>
-            <node>obelix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-        <testCase id="400000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="500000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower - nepes</desc>
-            <node>nepes</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
+	<testCase id="010010">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>idefix</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>idefix</id>
+	</testCase>
 
 	<testCase id="030000">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml
index 68d2f94af9..593e2d326d 100644
--- a/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml
+++ b/ci-scripts/xml_files/fr1_nsa_quectel_attach_detach.xml
@@ -55,29 +55,23 @@
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>idefix</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>idefix</id>
 	</testCase>
-
 	<testCase id="010003">
 		<class>Attach_UE</class>
 		<desc>Attach Quectel</desc>
 		<id>idefix</id>
 	</testCase>
-
 	<testCase id="010004">
 		<class>Detach_UE</class>
 		<desc>Detach Quectel</desc>
 		<id>idefix</id>
 	</testCase>	
 
-
 	<testCase id="030000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB</desc>
diff --git a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml
index c3801068a9..89825cdbf2 100644
--- a/ci-scripts/xml_files/fr1_nsa_quectel_long.xml
+++ b/ci-scripts/xml_files/fr1_nsa_quectel_long.xml
@@ -29,7 +29,7 @@
  030000
  040000
  000002
- 010000
+ 010000 010010
  000001
  050000
  050001
@@ -38,6 +38,7 @@
  000001
  070001
  000001
+ 010011
  010002
  080001
  080000
@@ -56,6 +57,16 @@
 		<desc>Terminate Quectel</desc>
 		<id>idefix</id>
 	</testCase>
+  <testCase id="010010">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>idefix</id>
+	</testCase>
+  <testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>idefix</id>
+	</testCase>
 
 
 	<testCase id="030000">
diff --git a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
index 96363dd4c8..c34fa34cf1 100644
--- a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
+++ b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml
@@ -27,34 +27,62 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 040000
- 000001
  010000
- 000002
+ 040000
+ 010001
+ 010002
  050000
+ 010100
+ 010200
+ 011111
  080000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
-		<desc>Run AS UE Scenario</desc>
+		<desc>Initialize AS-UE Scenario</desc>
+		<id>amarisoft_ue</id>
+	</testCase>
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
 		<id>amarisoft_ue_1</id>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
-
+	<testCase id="010002">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+		<id>amarisoft_ue_2</id>
+	</testCase>
+	<testCase id="010100">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+		<id>amarisoft_ue_1</id>
+	</testCase>
+	<testCase id="010200">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+		<id>amarisoft_ue_2</id>
+	</testCase>
+	<testCase id="011111">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+		<id>amarisoft_ue</id>
+	</testCase>
 
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
@@ -73,20 +101,14 @@
 	<testCase id="050000">
 		<class>Ping</class>
 		<desc>Ping Log Analysis</desc>
-		<id>amarisoft_ue_1</id>
+		<id>amarisoft_ue_1 amarisoft_ue_2</id>
 		<ping_packetloss_threshold>1</ping_packetloss_threshold>
 	</testCase>
 
 	<testCase id="000001">
 		<class>IdleSleep</class>
 		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
 	</testCase>
 
 
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
index 5995f75a64..0a8fd1bfa0 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
@@ -86,6 +86,7 @@
 	<testCase id="050001">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 100pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 100 -i 0.2</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -95,7 +96,7 @@
 		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 60M -t 60</iperf_args>
 		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
+		<id>oai_ue_obelix</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
@@ -105,7 +106,7 @@
 		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 3M -t 60</iperf_args>
 		<direction>UL</direction>
-		<id>nrmodule2_quectel</id>
+		<id>oai_ue_obelix</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
index c041d5976a..1e7311d4d0 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
@@ -51,18 +51,19 @@
 		<class>Terminate_OAI_UE</class>
 		<desc>Terminate OAI UE</desc>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
+
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
 
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
@@ -93,6 +94,7 @@
 	<testCase id="050000">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 20pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 20</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -100,6 +102,7 @@
 	<testCase id="050001">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 100pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 100 -i 0.2</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -107,9 +110,9 @@
 	<testCase id="070000">
 		<class>Iperf</class>
 		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<id>oai_ue_obelix</id>
 		<iperf_args>-u -b 60M -t 60</iperf_args>
 		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
@@ -117,9 +120,9 @@
 	<testCase id="070001">
 		<class>Iperf</class>
 		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<id>oai_ue_obelix</id>
 		<iperf_args>-u -b 3M -t 60</iperf_args>
 		<direction>UL</direction>
-		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
index ef001a7518..e3c7a04806 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
@@ -79,6 +79,7 @@
 	<testCase id="051000">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 20pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 20</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -86,6 +87,7 @@
 	<testCase id="051001">
 		<class>Ping</class>
 		<desc>Ping from CN to UE: 100pings in 20sec</desc>
+		<id>oai_ue_obelix</id>
 		<ping_args>-c 100 -i 0.2</ping_args>
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
@@ -93,9 +95,9 @@
 	<testCase id="070000">
 		<class>Iperf</class>
 		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<id>oai_ue_obelix</id>
 		<iperf_args>-u -b 60M -t 60</iperf_args>
 		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
@@ -103,9 +105,9 @@
 	<testCase id="070001">
 		<class>Iperf</class>
 		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<id>oai_ue_obelix</id>
 		<iperf_args>-u -b 3M -t 60</iperf_args>
 		<direction>UL</direction>
-		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml
index 12d8c762e2..7d1dda270a 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel.xml
@@ -27,59 +27,61 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 010002
  300000
- 040000
- 000002
  010000
- 000001
+ 040000
+ 010010
  050000
- 000001
  050001
- 000001
  070000
- 000001
  070001
- 000001
  070002
- 000001
- 010002
+ 010001
  080000
+ 020000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+	<testCase id="300000">
+		<class>Custom_Command</class>
+		<desc>Reboot USRP</desc>
+		<node>asterix</node>
+		<command>ssh root@172.21.19.14 reboot ; sleep 45</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
-	<testCase id="010002">
+	<testCase id="010010">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010001">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="020000">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-       </testCase>
-       <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-       </testCase>
-       <testCase id="300000">
-            <class>Custom_Command</class>
-            <desc>To reboot USRP</desc>
-            <node>asterix</node>
-            <command>ssh root@172.21.19.14 reboot ; sleep 45</command>
-       </testCase>
 
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
index d9aaf57cac..0f990db8c6 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
@@ -27,11 +27,9 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 010002
- 042000
- 000002
  010000
- 000001
+ 042000
+ 010001
  052000
  000001
  072000
@@ -40,6 +38,7 @@
  000001
  072002
  000001
+ 010011
  010002
  080000
  200000
@@ -50,10 +49,17 @@
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
@@ -74,18 +80,20 @@
 		<USRP_IPAddress>172.21.19.14</USRP_IPAddress>
 		<cmd_prefix>numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0</cmd_prefix>
 	</testCase>
-        <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-        </testCase>
-        <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-        </testCase>
+
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="000001">
 		<class>IdleSleep</class>
 		<desc>Sleep</desc>
diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
index 7c86dc0859..15cefab747 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
@@ -31,6 +31,7 @@
  041000
  000002
  011000
+ 011001
  000001
  051000
  000001
@@ -46,37 +47,47 @@
  000001
  071005
  000001
+ 011011
  011002
  081000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>asterix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="011000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-       <testCase id="100000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -D 0</command>
-       </testCase>
-       <testCase id="200000">
-            <class>Custom_Command</class>
-            <desc>To reset cpupower</desc>
-            <node>asterix</node>
-            <command>sudo cpupower idle-set -E</command>
-       </testCase>
+	<testCase id="011001">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel UE</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="011011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel UE </desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 	<testCase id="011002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
 
-
 	<testCase id="041000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
diff --git a/ci-scripts/xml_files/fr1_usrp210_band7_deploy_test_05mhz_tm1.xml b/ci-scripts/xml_files/fr1_usrp210_band7_deploy_test_05mhz_tm1.xml
deleted file mode 100644
index 3d04fdeb29..0000000000
--- a/ci-scripts/xml_files/fr1_usrp210_band7_deploy_test_05mhz_tm1.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-deploy-enb-mono</htmlTabRef>
-	<htmlTabName>Test-Deploy-eNB-Mono</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 040101
- 030101 000020 040301 000021 040501 040601 040611 040641 040651 040401 040201 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Waiting for 60 seconds</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Waiting for 10 seconds</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-    <testCase id="000020">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status before attachment</desc>
-        <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-    </testCase>
-
-    <testCase id="000021">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status after attachment</desc>
-        <expectedNbOfConnectedUEs>1</expectedNbOfConnectedUEs>
-    </testCase>
-
-	<testCase id="030101">
-		<class>Deploy_Object</class>
-		<desc>Deploy eNB (FDD/Band7/5MHz) in a container</desc>
-		<yaml_path>ci-scripts/yaml_files/fr1_enb_mono_fdd_tim</yaml_path>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Undeploy_Object</class>
-		<desc>Undeploy eNB</desc>
-		<yaml_path>ci-scripts/yaml_files/fr1_enb_mono_fdd_tim</yaml_path>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040501">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040611">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/7.5Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 7.5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040651">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-		<iperf_args>-t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/fr1_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/fr1_usrp210_band7_test_05mhz_tm1.xml
deleted file mode 100644
index 4d78b5b0a9..0000000000
--- a/ci-scripts/xml_files/fr1_usrp210_band7_test_05mhz_tm1.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
- 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030101 040301 000001 040501 040603 040401 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].plmn_list.[0].mcc 311 --eNBs.[0].plmn_list.[0].mnc 480 --eNBs.[0].plmn_list.[0].mnc_length 3 --eNBs.[0].component_carriers.[0].Nid_cell 10 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040501">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040604">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>unbalanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040606">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040607">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040644">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
index ac0510152d..382efbdd9e 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
@@ -31,13 +31,13 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
         <testCase id = "100000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Disable Sleep States</desc>
 		<node>caracal</node>
 		<command>sudo cpupower idle-set -D 0</command>
 	</testCase>
 	 <testCase id = "200000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Enable Sleep States</desc>
 		<node>caracal</node>
 		<command>sudo cpupower idle-set -E</command>
 	</testCase>
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
index bd43cc9ab6..24b0854224 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
@@ -31,13 +31,13 @@
   <TestCaseExclusionList></TestCaseExclusionList>
   <testCase id = "100000">
 	  <class>Custom_Command</class>
-	  <desc>To reset cpupower</desc>
+	  <desc>Disable Sleep States</desc>
 	  <node>caracal</node>
 	  <command>sudo cpupower idle-set -D 0</command>
   </testCase>
   <testCase id = "200000">
 	  <class>Custom_Command</class>
-	  <desc>To reset cpupower</desc>
+	  <desc>Enable Sleep States</desc>
 	  <node>caracal</node>
 	  <command>sudo cpupower idle-set -E</command>
   </testCase>
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
index 0190b5ddd6..29d284886c 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
@@ -26,18 +26,18 @@
   <htmlTabIcon>tasks</htmlTabIcon>
   <repeatCount>1</repeatCount>
   <TestCaseRequestedList>
-290101 000001 290109
+100000 290101 000001 290109 200000
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
   <testCase id="100000">
 	  <class>Custom_Command</class>
-	  <desc>To reset cpupower</desc>
+	  <desc>Disable Sleep States</desc>
 	  <node>caracal</node>
 	  <command>sudo cpupower idle-set -D 0</command>
   </testCase>
   <testCase id="200000">
 	  <class>Custom_Command</class>
-	  <desc>To reset cpupower</desc>
+	  <desc>Enable Sleep States</desc>
 	  <node>caracal</node>
 	  <command>sudo cpupower idle-set -E</command>
   </testCase>
diff --git a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_epc_start.xml b/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_epc_start.xml
deleted file mode 100644
index 51aaba439e..0000000000
--- a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_epc_start.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-start-oai-ue</htmlTabRef>
-	<htmlTabName>EPC-Start-OAI-UE</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 050101 000001 060101 000001 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-    </testCase>
-
-	<testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-	</testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_epc_stop.xml b/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_epc_stop.xml
deleted file mode 100644
index 07fb6951f8..0000000000
--- a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_epc_stop.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_terminate.xml b/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_terminate.xml
deleted file mode 100644
index 962aec4129..0000000000
--- a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_terminate.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>terminate-enb-oai-ue</htmlTabRef>
-	<htmlTabName>Terminate-all-eNBs-OAI-UEs</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201 090109
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="090109">
-		<class>Terminate_OAI_UE</class>
-		<desc>Terminate OAI UE</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1.xml
deleted file mode 100644
index cd9ed8809e..0000000000
--- a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1-oai-ue</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1-OAI-UE</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201 090109
- 030102 000001 090102 000002 040503 000002 040603 040604 040643 040644 000002 090109 000001 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep for 10 sec</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep for 3 sec</desc>
-		<idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030102">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="090102">
-		<class>Initialize_OAI_UE</class>
-		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
-		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 130 --ue-txgain 1 --ue-max-power -6 --ue-scan-carrier --nokrnmod 1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
-	</testCase>
-
-	<testCase id="090109">
-		<class>Terminate_OAI_UE</class>
-		<desc>Terminate OAI UE</desc>
-	</testCase>
-
-	<testCase id="040503">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-       		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040604">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/12Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 12M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040644">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 2M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1_nos1.xml b/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1_nos1.xml
deleted file mode 100644
index 16cc4b9a41..0000000000
--- a/ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1_nos1.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 030201 090109
- 030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000003">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="090101">
-		<class>Initialize_OAI_UE</class>
-		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
-		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 130 --ue-txgain 1 --ue-max-power -6 --ue-scan-carrier --nokrnmod 1 --noS1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
-	</testCase>
-
-	<testCase id="090109">
-		<class>Terminate_OAI_UE</class>
-		<desc>Terminate OAI UE</desc>
-	</testCase>
-
-	<testCase id="040501">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)(from eNB to OAI UE)</desc>
-		<ping_args>-I oaitun_enb1 -c 20 10.0.1.2</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040502">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)(from OAI UE to eNB)</desc>
-		<ping_args>-I oaitun_ue1 -c 20 10.0.1.1</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040602">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/10Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.2 -u -b 10M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.1 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.1 -u -b 2M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>balanced</iperf_profile>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_usrp210_band7_build.xml b/ci-scripts/xml_files/inria/enb_usrp210_band7_build.xml
deleted file mode 100644
index d3e9825923..0000000000
--- a/ci-scripts/xml_files/inria/enb_usrp210_band7_build.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab-enb0</htmlTabRef>
-	<htmlTabName>Build eNB0</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
- 010102
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build eNB #0 (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="010102">
-		<class>Build_eNB</class>
-		<desc>Build eNB #1 (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_usrp210_band7_epc_start.xml b/ci-scripts/xml_files/inria/enb_usrp210_band7_epc_start.xml
deleted file mode 100644
index 5fc3a2e960..0000000000
--- a/ci-scripts/xml_files/inria/enb_usrp210_band7_epc_start.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-start</htmlTabRef>
-	<htmlTabName>EPC-Start</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 050102 000001 060102 000001 070102
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-    </testCase>
-
-	<testCase id="050102">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-	</testCase>
-
-	<testCase id="060102">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070102">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_usrp210_band7_epc_stop.xml b/ci-scripts/xml_files/inria/enb_usrp210_band7_epc_stop.xml
deleted file mode 100644
index 617e78b3bf..0000000000
--- a/ci-scripts/xml_files/inria/enb_usrp210_band7_epc_stop.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-stop</htmlTabRef>
-	<htmlTabName>EPC-Stop</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
- 040101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/inria/enb_usrp210_band7_test_05mhz_tm1.xml
deleted file mode 100644
index d0f94dc560..0000000000
--- a/ci-scripts/xml_files/inria/enb_usrp210_band7_test_05mhz_tm1.xml
+++ /dev/null
@@ -1,394 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-05-tm1</htmlTabRef>
-	<htmlTabName>Test-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 040101 030201
- 030103 000002
- 040301 000002 040504 040605 040606 040645 040646 040401
- 040301 000002 040505 000001 040401
- 040301 000002 040506 000001 040401
- 040301 000002 040507 000001 040401
- 040301 000002 040508 000001 040401
- 040301 000002 040509 000001 040401
- 040301 000002 040510 000001 040401
- 040301 000002 040511 000001 040401
- 040301 000002 040512 000001 040401
- 040301 000002 040513 000001 040401
- 040301 000002 040514 000001 040401
- 040301 000002 040515 000001 040401
- 040301 000002 040516 000001 040401
- 040301 000002 040517 000001 040401
- 040301 000002 040518 000001 040401
- 040301 000002 040519 000001 040401
- 040301 000002 040520 000001 040401
- 040301 000002 040521 000001 040401
- 040301 000002 040522 000001 040401
- 040301 000002 040523 000001 040401
- 040301 000002 040524 000001 040401
- 040301 000002 040525 000001 040401
- 040301 000002 040526 000001 040401
- 040301 000002 040527 000001 040401
- 040301 000002 040528 000001 040401
- 040301 000002 040529 000001 040401
- 040301 000002 040530 000001 040401
- 040301 000002 040531 000001 040401
- 040301 000002 040532 000001 040401
- 040301 000002 040533 000001 040401
- 040301 000002 040534 000001 040401
- 040301 000002 040535 000001 040401
- 040301 000002 040536 000001 040401
- 040301 000002 040537 000001 040401
- 040301 000002 040538 000001 040401
- 040301 000002 040539 000001 040401
- 040201 000002 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep for 10 sec</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep for 3 sec</desc>
-		<idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030103">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040504">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040505">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040506">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040507">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040508">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040509">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040510">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040511">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040512">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040513">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040514">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040515">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040516">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040517">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040518">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040519">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040520">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040521">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040522">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040523">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040524">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040525">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040526">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040527">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040528">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040529">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040530">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040531">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040532">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040533">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040534">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040535">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040536">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040537">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040538">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040539">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040605">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040606">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040645">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040646">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/3.8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 3.8M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml b/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml
deleted file mode 100644
index e3198bacee..0000000000
--- a/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-x2-ho-05-tm1</htmlTabRef>
-	<htmlTabName>Test-X2-Handover-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 040101 030201 030202
- 050102
- 030104 000002 030105 000002
- 040301 000002
- 040540 040615 040655
- 050401 000001
- 040541 040617 040657
- 040401 000001
- 040201 000002 030201 030202
- 050202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep for 10 sec</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep for 3 sec</desc>
-		<idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030104">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB #0 (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --eNBs.[0].enable_measurement_reports yes --eNBs.[0].enable_x2 yes --eNBs.[0].nr_cellid 123456 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030105">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB #1 (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --eNBs.[0].enable_measurement_reports yes --eNBs.[0].enable_x2 yes --eNBs.[0].nr_cellid 98765 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB #0</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB #1</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040540">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040541">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040542">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040615">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040616">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040617">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040618">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1 -fm</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040655">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040656">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/3.8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 3.8M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040657">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040658">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/3.8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 3.8M -t 30 -i 1 -fm -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/inria/ue_usrp210_band7_build.xml b/ci-scripts/xml_files/inria/ue_usrp210_band7_build.xml
deleted file mode 100644
index 7d7ae6e0df..0000000000
--- a/ci-scripts/xml_files/inria/ue_usrp210_band7_build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab-ue0</htmlTabRef>
-	<htmlTabName>Build UE0</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
-090101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="090101">
-		<class>Build_OAI_UE</class>
-		<desc>Build OAI UE</desc>
-		<Build_OAI_UE_args>-w USRP --UE</Build_OAI_UE_args>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml b/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
index a131ddd194..4270510842 100644
--- a/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
+++ b/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
@@ -27,48 +27,53 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 010002
+ 010000 
  030000
- 000002
- 010000
- 000001
+ 010001
  050000
  050001
- 000002
  070000
  070001
- 000001
+ 010011
  010002
  080000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="100000">
+
+	<testCase id="100000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Disable Sleep States</desc>
 		<node>obelix</node>
 		<command>sudo cpupower idle-set -D 0</command>
 	</testCase>
-        <testCase id="200000">
+	<testCase id="200000">
 		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
+		<desc>Enable Sleep States</desc>
 		<node>obelix</node>
 		<command>sudo cpupower idle-set -E</command>
-        </testCase>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 
 	<testCase id="030000">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml b/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
index f5e8d8454f..d02749700d 100644
--- a/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
+++ b/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
@@ -27,49 +27,53 @@
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
  100000
- 010002
+ 010000 
  030001
- 000002
- 010000
- 000001
+ 010001
  050002
  050003
- 000002
  070002
  070003
- 000001
+ 010011
  010002
  080000
  200000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="100000">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+	<testCase id="200000">
+		<class>Custom_Command</class>
+		<desc>Enable Sleep States</desc>
+		<node>obelix</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="010000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
-		<UE_Trace>yes</UE_Trace>
 	</testCase>
-
-        <testCase id="100000">
-		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
-		<node>obelix</node>
-		<command>sudo cpupower idle-set -D 0</command>
-	</testCase>
-        <testCase id="200000">
-		<class>Custom_Command</class>
-		<desc>To reset cpupower</desc>
-		<node>obelix</node>
-		<command>sudo cpupower idle-set -E</command>
-        </testCase>
-
 	<testCase id="010002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
-
+	<testCase id="010001">
+		<class>Attach_UE</class>
+		<desc>Attach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
+	<testCase id="010011">
+		<class>Detach_UE</class>
+		<desc>Detach Quectel</desc>
+		<id>nrmodule2_quectel</id>
+	</testCase>
 
 	<testCase id="030001">
 		<class>Initialize_eNB</class>
diff --git a/ci-scripts/xml_files/test_case_list_template.xml b/ci-scripts/xml_files/test_case_list_template.xml
index 1a8871c037..eecdfe80b9 100644
--- a/ci-scripts/xml_files/test_case_list_template.xml
+++ b/ci-scripts/xml_files/test_case_list_template.xml
@@ -102,34 +102,6 @@
 		<desc>Detach UE</desc>
 	</testCase>
 
-
-	<testCase id="040701">
-		<class>Reboot_UE</class>
-		<desc>Reboot UE</desc>
-	</testCase>
-
-	<!-- CAT-M UE class command references -->
-
-	<testCase id="040102">
-		<class>Initialize_CatM_module</class>
-		<desc>Initialize CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040202">
-		<class>Terminate_CatM_module</class>
-		<desc>Terminate CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040302">
-		<class>Attach_CatM_module</class>
-		<desc>Attach CAT-M Module</desc>
-	</testCase>
-
-	<testCase id="040402">
-		<class>Detach_CatM_module</class>
-		<desc>Detach CAT-M Module</desc>
-	</testCase>
-
 	<!-- EPC class command references -->
 
         <testCase id="050101">
diff --git a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_build.xml b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_build.xml
deleted file mode 100644
index 0ac6bfcc0d..0000000000
--- a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 010101
- 010102
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="010101">
-		<class>Build_eNB</class>
-		<desc>Build Master eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="010102">
-		<class>Build_eNB</class>
-		<desc>Build Slave eNB (USRP)</desc>
-		<Build_eNB_args>-w USRP -c --eNB --ninja</Build_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_closure.xml b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_closure.xml
deleted file mode 100644
index 07fb6951f8..0000000000
--- a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_closure.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-closure</htmlTabRef>
-	<htmlTabName>EPC-Closure</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="050201">
-		<class>Terminate_HSS</class>
-		<desc>Terminate HSS</desc>
-	</testCase>
-
-	<testCase id="060201">
-		<class>Terminate_MME</class>
-		<desc>Terminate MME</desc>
-	</testCase>
-
-	<testCase id="070201">
-		<class>Terminate_SPGW</class>
-		<desc>Terminate SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_start.xml b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_start.xml
deleted file mode 100644
index 0a788cb614..0000000000
--- a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_epc_start.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>epc-start-tab</htmlTabRef>
-	<htmlTabName>EPC-Start</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 050101 060101 070101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="050101">
-		<class>Initialize_HSS</class>
-		<desc>Initialize HSS</desc>
-	</testCase>
-
-	<testCase id="060101">
-		<class>Initialize_MME</class>
-		<desc>Initialize MME</desc>
-	</testCase>
-
-	<testCase id="070101">
-		<class>Initialize_SPGW</class>
-		<desc>Initialize SPGW</desc>
-	</testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml
deleted file mode 100644
index 488b95af13..0000000000
--- a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>test-x2-ho-full-end</htmlTabRef>
-	<htmlTabName>Test-X2-HO-Full-Terminate</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201 030202
- 050202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Master eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Slave eNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-</testCaseList>
diff --git a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_test_05mhz_tm1.xml b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_test_05mhz_tm1.xml
deleted file mode 100644
index 40a137adb4..0000000000
--- a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_test_05mhz_tm1.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
- 030101 000002 030102 040301 040501 040601 040641 050401 000002 040502 040602 040642 050402 000002 040503 040603 040643 040401 040201 030201 030202
--->
-<testCaseList>
-	<htmlTabRef>test-x2-ho-05-tm1</htmlTabRef>
-	<htmlTabName>Test-X2-HO-FDD-05MHz-TM1</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestUnstable>True</TestUnstable>
-	<TestCaseRequestedList>
- 030201 030202
- 040101
- 050102
- 030101 000002 030102 040301 040501 050401 000002 040502 050402 000002 040503 040401 040201 030201 030202
- 050202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Waiting for 60 seconds</desc>
-		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Waiting for 10 seconds</desc>
-		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030101">
-		<class>Initialize_eNB</class>
-		<desc>Initialize Master eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band13.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030102">
-		<class>Initialize_eNB</class>
-		<desc>Initialize Slave eNB (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.slave.band13.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Master eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate Slave eNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040501">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040502">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040503">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 8M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040602">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 8M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040603">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/8Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 8M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/5Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040642">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/5Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040643">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/5Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 26fca9bd5c..0b858d0879 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -53,16 +53,10 @@ BUILD_COVERITY_SCAN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
+MAKE_CMD=make
 BUILD_ECLIPSE=0
 NR="False"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_t1 oai_iqplayer"
-ulfiusdep=$(basename ./`find /usr/lib* -name libulfius.so`)
-jssondep=$(basename ./`find /usr/lib* -name libjansson.so`)
-if [ "$ulfiusdep" == "libulfius.so" -a "$jssondep" == "libjansson.so" ] ; then
-  OPTIONAL_LIBRARIES+=" websrv"
-else
-  echo_warning "  websrv optional build not included in build-lib option  as dependencies requirements not met "
-fi
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t1 websrv oai_iqplayer"
 RU=0
 CMAKE_C_FLAGS=()
 CMAKE_CXX_FLAGS=()
@@ -99,8 +93,6 @@ Options:
    enable cmake debugging messages
 --eNB
   Makes the LTE softmodem
---eNBocp
-  Makes the OCP LTE softmodem
 --gNB
   Makes the NR softmodem
 --RU
@@ -254,10 +246,6 @@ function main() {
             eNB=1
             echo_info "Will compile eNB"
             shift;;
-       --eNBocp)
-            eNBocp=1
-            echo_info "Will compile OCP eNB"
-            shift;;
       --gNB)
             gNB=1
             echo_info "Will compile gNB"
@@ -457,7 +445,7 @@ function main() {
   ########################################################
   # to be discussed
   
-  if [ "$eNB" = "1" -o "$eNBocp" = "1" -o "$gNB" = "1" ] ; then
+  if [ "$eNB" = "1" -o "$gNB" = "1" ] ; then
       if [ "$HW" = "None" -a  "$TP" = "None" ] ; then
 	      echo_info "No local radio head and no transport protocol selected"
       fi
@@ -532,9 +520,6 @@ function main() {
   if [ "$eNB" = "1" ] ; then
       execlist="$execlist lte-softmodem"
   fi
-  if [ "$eNBocp" = "1" ] ; then
-      execlist="$execlist ocp-enb"
-  fi
   if [ "$gNB" = "1" ] ; then
       execlist="$execlist nr-softmodem nr-cuup"
   fi
@@ -660,7 +645,7 @@ function main() {
   ####################################################
   # Build RF device and transport protocol libraries #
   ####################################################
-  if [ "$eNB" = "1" -o "$eNBocp" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$RU" = "1"  -o "$nrUE" = "1" ] ; then
+  if [ "$eNB" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$RU" = "1"  -o "$nrUE" = "1" ] ; then
 
       # build RF device libraries
       if [ "$HW" != "None" ] ; then
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index d2dc1696bf..b8ff564ae8 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -551,6 +551,7 @@ check_install_additional_tools (){
     PACKAGE_LIST="\
 	doxygen \
 	libpthread-stubs0-dev \
+	libqt5charts5-dev \
 	tshark \
 	uml-utilities \
         iperf3 \
diff --git a/common/utils/assertions.h b/common/utils/assertions.h
index a5b2149ede..3424392e7a 100644
--- a/common/utils/assertions.h
+++ b/common/utils/assertions.h
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <platform_types.h>
-#include "backtrace.h"
 
 #define OAI_EXIT_NORMAL 0
 #define OAI_EXIT_ASSERT 1
diff --git a/common/utils/backtrace.c b/common/utils/backtrace.c
deleted file mode 100644
index 634bb3a834..0000000000
--- a/common/utils/backtrace.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <signal.h>
-#include <execinfo.h>
-
-#include <common/utils/backtrace.h>
-
-/* Obtain a backtrace and print it to stdout. */
-void display_backtrace(void) {
-  void *array[10];
-  size_t size;
-  char **strings;
-  size_t i;
-  char *test=getenv("NO_BACKTRACE");
-
-  if (test!=0) abort();
-
-  size = backtrace(array, 10);
-  strings = backtrace_symbols(array, size);
-  printf("Obtained %u stack frames.\n", (unsigned int)size);
-
-  for (i = 0; i < size; i++)
-    printf("%s\n", strings[i]);
-
-  free(strings);
-}
diff --git a/common/utils/backtrace.h b/common/utils/backtrace.h
deleted file mode 100644
index 9aaf718453..0000000000
--- a/common/utils/backtrace.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-#include <signal.h>
-
-#ifndef BACKTRACE_H_
-#define BACKTRACE_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-void display_backtrace(void);
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* BACKTRACE_H_ */
diff --git a/common/utils/telnetsrv/telnetsrv_proccmd.c b/common/utils/telnetsrv/telnetsrv_proccmd.c
index b95178138e..2d3450174a 100644
--- a/common/utils/telnetsrv/telnetsrv_proccmd.c
+++ b/common/utils/telnetsrv/telnetsrv_proccmd.c
@@ -504,7 +504,6 @@ int proccmd_exit(char *buf, int debug, telnet_printfunc_t prnt)
 {
    if (debug > 0)
        prnt("process module received %s\n",buf);
-   end_configmodule();
    exit_fun("telnet server received exit command\n");
    return 0;
 }
diff --git a/common/utils/threadPool/Makefile b/common/utils/threadPool/Makefile
index 729f9dd0e2..8913edb1f4 100644
--- a/common/utils/threadPool/Makefile
+++ b/common/utils/threadPool/Makefile
@@ -1,3 +1,3 @@
 thread-pool-test: thread-pool.c thread-pool.h
-	gcc -g -O3 thread-pool.c -I ${OPENAIR_DIR}/nfapi/open-nFAPI/nfapi/public_inc -I ${OPENAIR_DIR}/ -I ${OPENAIR_DIR}/common/utils/  -I. ${OPENAIR_DIR}/common/utils/backtrace.c -I ${OPENAIR_DIR}/openair2/COMMON ${OPENAIR_DIR}/common/utils/system.c ${OPENAIR_DIR}/common/utils/LOG/log.c ${OPENAIR_DIR}/common/config/config_userapi.c ${OPENAIR_DIR}/common/config/config_load_configmodule.c ${OPENAIR_DIR}/common/config/config_cmdline.c -lpthread -ldl -D TEST_THREAD_POOL -DMAX_NUM_CCs=1 -I../LOG -I../../utils/T -o thread-pool-test
+	gcc -g -O3 thread-pool.c -I ${OPENAIR_DIR}/nfapi/open-nFAPI/nfapi/public_inc -I ${OPENAIR_DIR}/ -I ${OPENAIR_DIR}/common/utils/  -I. -I ${OPENAIR_DIR}/openair2/COMMON ${OPENAIR_DIR}/common/utils/system.c ${OPENAIR_DIR}/common/utils/LOG/log.c ${OPENAIR_DIR}/common/config/config_userapi.c ${OPENAIR_DIR}/common/config/config_load_configmodule.c ${OPENAIR_DIR}/common/config/config_cmdline.c -lpthread -ldl -D TEST_THREAD_POOL -DMAX_NUM_CCs=1 -I../LOG -I../../utils/T -o thread-pool-test
 
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 1fb88bba74..51492143d7 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -890,7 +890,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_userapi.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/oai_asn1.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/backtrace.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_stat.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/load_module_shlib.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.c \
@@ -2218,11 +2217,13 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/LTE_ESTIMATION/filt16_32.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_scope.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/cdot_prod.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_scope.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/phy_scope_interface.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/phy_scope_interface.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_scope.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_scope.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_qt_scope.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/nr_phy_qt_scope.cpp \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/file_output.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/dfts_load.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/TOOLS/alaw_lut.h \
@@ -2547,7 +2548,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../executables/create_tasks.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../executables/softmodem-common.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../executables/rt_profiling.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../executables/split_headers.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../executables/create_tasks.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-uesoftmodem.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../executables/nr-uesoftmodem.h \
diff --git a/doc/FEATURE_SET.md b/doc/FEATURE_SET.md
index 3f7ffc9fdb..726fe84a74 100644
--- a/doc/FEATURE_SET.md
+++ b/doc/FEATURE_SET.md
@@ -357,6 +357,7 @@ The following features are valid for the gNB and the 5G-NR UE.
   - RRCSetupRequest/RRCSetup/RRCSetupComplete
   - RRC Uplink/Downlink Information transfer carrying NAS messages transparently
   - RRC Reconfiguration/Reconfiguration complete
+  - RRC Reestablishment/Reestablishment complete
   - Paging
   - Support for master cell group configuration
   - Interface with NGAP for the interactions with the AMF
diff --git a/doc/SystemX-tutorial-design.md b/doc/SystemX-tutorial-design.md
index 3e4496f7de..804658fd4d 100644
--- a/doc/SystemX-tutorial-design.md
+++ b/doc/SystemX-tutorial-design.md
@@ -109,196 +109,6 @@ route add default oaitun_ue1
 or specify the outgoing route in the traffic generator (like option “-I”
 in ping command).
 
-## Split 6 DL 4G
-
-The contract describes to reuse the uplink existing if4p5 and to develop
-is this work the downlink “functional split 6”.
-
-The customer required after signature to develop also the uplink
-functional split 6. This is accepted, as long as the whole work is
-research with no delivery completeness warranty.
-
-### Simulation
-
-To be able to verify the new features and to help in all future
-developments, Open Cells added and improved the Rf board simulator
-during this contract.
-
-We added the channel modeling simulation, that offer to simulate various
-3GPP defined channels.
-
-### Main loop
-
-The main log is in RF simulator is in
-
- `targets/RT/USER/lte-ru.c and targets/RT/USER/lte-enb.c`
-
-As this piece of SW is very complex and doesn’t meet our goals
-(functional split 6), a cleaned version replaces these 2 files in
-executables/ocp-main.c (openair1/SCHED/prach\_procedures.c is also
-replaced by this new file as it only launching the RACH actual work in a
-way not compatible with our FS6).
-
-The main loop cadences the I/Q samples reception, signal processing and
-I/Q samples sending.
-
-The main loop uses extensively function pointers to call the right
-processing function depending on the split case.
-
-A lot of OAI reduntant global variables contains the same semantic data: time,frame, subframe.
-The reworked main loop take care of a uniq variable that comes directly from harware: RF board sampling number.
-
-To use OAI, we need to set all OAI variables that derivates from this timestamp value. The function setAllfromTS() implements this.
-
-### Splitted main level
-
-When FS6 is actived, a main loop for DU (du_fs6()) a main loop for CU case replaces the uniq eNB main loop.
-
-Each of these main loops calls initialization of OAI LTE data and the FS6 transport layer initialization.
-
-Then, it runs a infinite loop on: set time, call UL and DL. The time comes from the RF board, so the DU sends the time to the CU.
-
-This is enough for RF board dialog, but the FS6 is higher in SW layers,
-we need to cut higher functions inside downlink and uplink procedures.
-
-As much as possible, the FS6 code is in the directory OPENAIR_DIR/executables. When a given OAI piece of code is small or need complex changes, it is reworked in the file fs6-main.c. The functions naming keeps the OAI function name, adding suffix _fromsplit() or _tosplit().
-
-When this organization would lead to large code copy, it is better to insert modifications in OAI code. This is done in two files: 
-
-- openair1/SCHED/phy_procedures_lte_eNb.c: to send signaling channels computation results
-    - the function sendFs6Ulharq() centralizes all signaling channels forwarding to CU
-- openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c: to deal with FS6 user plane split
-    - sendFs6Ul() is used once to forward user plane to CU
-
-
-### DownLink
-
-The main procedure is phy\_procedures\_eNB\_TX()
-
-This is building the common channels (beacon, multi-UE signaling).
-
-The FS6 split breaks this function into pieces:
-
-*   The multi-UE signals, built by common\_signal\_procedures(),
-    subframe2harq\_pid(), generate\_dci\_top(), subframe2harq\_pid()
-    *   These functions run in the DU, nevertheless all  context has to be sent 
-    (it is also needed partially for UL spitting)
-    * Run in the DU also to meet the requirement of pushing
-        in DU the data encoded with large redundancy (&gt;3 redundancy)
-        
-*   the per UE data: pdsch\_procedures() needs further splitting:
-
-    *   dlsch\_encoding\_all() that makes the encoding: turbo code
-        and lte\_rate\_matching\_turbo() that will be in the DU (some
-        unlikely cases can reach redundancy up to x3, when MCS is very
-        low (negative SINR cases)).
-
-        *   dlsch\_encoding() output needs to be transmitted between the
-            DU and the CU for functional split 6.
-            * dlsch\_scrambling() that will go in the DU
-            * dlsch\_modulation() that will go in the DU
-   
-   The du user plane data is made of expanded bit in OAI at FS6 split level. 1 pair of functions compact back these bits into 8bits/byte before sending data and expand it again in the DU data reception (functions: fs6Dl(un)pack()).
-
-### Uplink
-
-The uplink require configuration that is part of the DL transmission.
-
-It interprets the signalling to extract the RACH and the per UE data
-channels.
-
-Ocp-main.c:rxtx() calls directly the entry procedure
-phy\_procedures\_eNB\_uespec\_RX() calls:
-
-*   rx\_ulsch() that demodulate and extract soft bits per UE.
-
-    *   This function runs in the DU
-    *   the output data will be processes in the DU, so it needs to be
-        transmitted to the DU
-*   ulsch\_decoding() that do lte\_rate\_matching\_turbo\_rx()
-    sub\_block\_deinterleaving\_turbo() 
-    then turbo decode that is in the CU
-*   fill\_ulsch\_cqi\_indication()  fill\_crc\_indication() , fill\_rx\_indication()
-          *   DU performs the signal processing of each channel data, prepare and sent to the CU the computed result
-
-* Random access channel detection runs in the DU
-      * the DU reports to the CU only the detected temprary identifier for RACH response
-
-
-### signaling data in each direction (UL and DL)
-
-
-*   each LTE channel needs to be propagated between CU and DU
-    * the simplest are the almost static data such as PSS/SSS, that need only static eNB parameters and primary information (frame numbering)
-    * all the other channels require data transmission CU to DU and DU to CU
-    * the general design push all the low level processing for these channels in the DU 
-    * the CU interface transports only signal processing results (UL) or configuration to create the RF signal (DL case)
-* HARQ is detected in the DU, then only the ACK or NACK is reported to CU
-
-* the CU have to control the power and MCS (modulation and coding scheme)
-    * the DU performs the signal processing and report only the decoded data like the CQI
-  * as the DU performas the modulation, scrambling and puncturing, each data packet is associated with the LTE parameters required for these features
-       * in DL, the CU associates the control parameters and the user plane data
-       * in UL, the CU sends upfront the scheduled UL data to the DU.  So, the DU have the required knowledge to decode the next subframes in time.
-
-### UDP transport layer
-
-A general UDP transport layer is in executables/transport\_split.c
-
-Linux offers a UDP socket builtin timeout, that we use.
-
-In and out buffers are memory zones that contains compacted
-(concatenated) UDP chunks.
-
-For output, sendSubFrame() sends each UDP chunk
-
-For input, receiveSubFrame() collects all UDP chunks for a group (a
-subframe in OAI LTE case). It returns in the following cases:
-
--   all chunks are received
--   a timeout expired
--   a chunk from the next subframe already arrived
-
-### Functional split 6 usage
-
-The ocp cleaned main hale to be used: run ocp-softmodem instead of
-lte-softmodem.
-
-The functionality and parameters is the same, enhanced with FS6 mode.
-
-The end line option “--split73” enables the fs6 (also called split 7.3) mode and decided to be cu or du.
-
-Example:
-
-```bash
-./ocp-softmodem -O $OPENAIR_DIR/enb.fs6.example.conf --rfsim  --log_config.phy_log_level debug --split73 cu:127.0.0.1
-```
-
-Run the CU init of the split 6 eNB, that will call du on 127.0.0.1 address
-
-```bash
-./ocp-softmodem -O $OPENAIR_DIR/enb.fs6.example.conf --rfsim  --log_config.phy_log_level debug --split73 du:127.0.0.1
-```
-
-will run the du, calling the cu on 127.0.0.1
-
-If the CU and the DU are not on the same machine, the remote address of each side need to be specified as per this example
-
-```bash
-./ocp-softmodem -O $OPENAIR_DIR/enb.fs6.example.conf --rfsim  --log_config.phy_log_level debug --split73 du:192.168.1.55
-```
-
-runs the functional split 6 DU
-
-```bash
-./lte-uesoftmodem -C 2685000000 -r 50 --rfsim --rfsimulator.serveraddr 192.168.1.1 -d
-```
-
-Runs the UE (to have the UE signal scope, compile it with make uescope)
-
-CU+DU+UE can run with option `--noS1` to avoid to use a EPC and/or with `--rfsim` to simulate RF board
-
-
 ## 5G and F1
 
 Today 5G achievement is limited to physical layer.
diff --git a/docker/Dockerfile.build.ubuntu20 b/docker/Dockerfile.build.ubuntu20
index cc8d4babb2..71025d3bab 100644
--- a/docker/Dockerfile.build.ubuntu20
+++ b/docker/Dockerfile.build.ubuntu20
@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP --verbose-ci --noavx512 -c
diff --git a/executables/create_tasks.c b/executables/create_tasks.c
index 97e8880e9c..8382cc4074 100644
--- a/executables/create_tasks.c
+++ b/executables/create_tasks.c
@@ -36,7 +36,6 @@
   #include "RRC/LTE/rrc_defs.h"
 # include "enb_app.h"
 # include "openair2/LAYER2/MAC/mac_proto.h"
-#include <executables/split_headers.h> 
 #include <openair3/ocp-gtpu/gtp_itf.h>
 
 extern RAN_CONTEXT_t RC;
@@ -52,12 +51,13 @@ int create_tasks(uint32_t enb_nb) {
   AssertFatal(rc >= 0, "Create task for eNB APP failed\n");
   rrc_enb_init();
   itti_mark_task_ready(TASK_RRC_ENB);
-  if (get_softmodem_params()->emulate_l1 || (EPC_MODE_ENABLED && split73 != SPLIT73_DU)) {
+
+  if (get_softmodem_params()->emulate_l1 || EPC_MODE_ENABLED) {
     rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
     AssertFatal(rc >= 0, "Create task for SCTP failed\n");
   }
 
-  if (EPC_MODE_ENABLED && ! ( split73==SPLIT73_DU ) ) {
+  if (EPC_MODE_ENABLED) {
     rc = itti_create_task(TASK_S1AP, s1ap_eNB_task, NULL);
     AssertFatal(rc >= 0, "Create task for S1AP failed\n");
     rc = itti_create_task(TASK_GTPV1_U, gtpv1uTask, NULL);
diff --git a/executables/lte-softmodem.c b/executables/lte-softmodem.c
index 6d98f6de94..2e882c13cc 100644
--- a/executables/lte-softmodem.c
+++ b/executables/lte-softmodem.c
@@ -84,7 +84,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 
 #include "lte-softmodem.h"
 #include "NB_IoT_interface.h"
-#include <executables/split_headers.h>
 
 #if USING_GPROF
 #  include "sys/gmon.h"
@@ -146,14 +145,6 @@ int otg_enabled;
 
 uint64_t num_missed_slots=0; // counter for the number of missed slots
 
-int split73=0;
-void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
-  AssertFatal(false, "Must not be called in this context\n");
-}
-void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask, uint16_t rnti, int32_t stat) {
-  AssertFatal(false, "Must not be called in this context\n");
-}
-
 RU_t **RCconfig_RU(int nb_RU,int nb_L1_inst,PHY_VARS_eNB ***eNB,uint64_t *ru_mask,pthread_mutex_t *ru_mutex,pthread_cond_t *ru_cond);
 
 RU_t **RCconfig_RU(int nb_RU,int nb_L1_inst,PHY_VARS_eNB ***eNB,uint64_t *ru_mask,pthread_mutex_t *ru_mutex,pthread_cond_t *ru_cond);
diff --git a/executables/main-fs6.c b/executables/main-fs6.c
deleted file mode 100644
index 51bf6d166e..0000000000
--- a/executables/main-fs6.c
+++ /dev/null
@@ -1,1667 +0,0 @@
-/*
-* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The OpenAirInterface Software Alliance licenses this file to You under
-* the OAI Public License, Version 1.1  (the "License"); you may not use this file
-* except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.openairinterface.org/?page_id=698
-*
-* Author and copyright: Laurent Thomas, open-cells.com
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*-------------------------------------------------------------------------------
-* For more information about the OpenAirInterface (OAI) Software Alliance:
-*      contact@openairinterface.org
-*/
-
-#include <stdint.h>
-#include <common/utils/LOG/log.h>
-#include <common/utils/system.h>
-#include <common/config/config_userapi.h>
-#include "executables/lte-softmodem.h"
-#include <openair1/PHY/defs_eNB.h>
-#include <openair1/PHY/phy_extern.h>
-#include <nfapi/oai_integration/vendor_ext.h>
-#include <openair1/SCHED/fapi_l1.h>
-#include <openair1/PHY/INIT/phy_init.h>
-#include <openair2/LAYER2/MAC/mac_extern.h>
-#include <openair1/PHY/LTE_REFSIG/lte_refsig.h>
-#include <nfapi/oai_integration/nfapi_pnf.h>
-#include <executables/split_headers.h>
-#include <nfapi/oai_integration/vendor_ext.h>
-#include <openair1/PHY/INIT/lte_init.c>
-#include <openair1/PHY/LTE_ESTIMATION/lte_estimation.h>
-#include <executables/split_headers.h>
-#include <openair1/PHY/CODING/coding_extern.h>
-#include <threadPool/thread-pool.h>
-#include "PHY/sse_intrin.h"
-
-#define FS6_BUF_SIZE 1000*1000
-static UDPsock_t sockFS6;
-
-int sum(uint8_t *b, int s) {
-  int sum=0;
-
-  for (int i=0; i < s; i++)
-    sum+=b[i];
-
-  return sum;
-}
-
-
-extern double cpuf;
-
-typedef struct m {
-  uint64_t iterations;
-  uint64_t sum;
-  uint64_t maxArray[11];
-} Meas;
-
-int cmpint(const void *a, const void *b)
-{
-  uint64_t *aa=(uint64_t *)a;
-  uint64_t *bb=(uint64_t *)b;
-  return (int)(*aa-*bb);
-}
-
-static inline void printMeas(char *txt,
-                                    Meas *M,
-                                                        int period)
-{
-  if (M->iterations%period == 0 ) {
-    char txt2[512];
-    sprintf(txt2,"%s avg=%" PRIu64 " iterations=%" PRIu64 " max=%"
-            PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 "\n",
-            txt,
-            M->sum/M->iterations,
-            M->iterations,
-            M->maxArray[1],M->maxArray[2], M->maxArray[3],M->maxArray[4], M->maxArray[5],
-            M->maxArray[6],M->maxArray[7], M->maxArray[8],M->maxArray[9],M->maxArray[10]);
-#if T_TRACER
-    LOG_W(PHY,"%s",txt2);
-#else
-    printf("%s",txt2);
-#endif
-  }
-}
-
-void updateTimes(uint64_t start, Meas *M, int period, char *txt)
-{
-  if (start!=0) {
-    uint64_t end=rdtsc_oai();
-    long long diff=(end-start)/(cpuf*1000);
-    M->maxArray[0]=diff;
-    M->sum+=diff;
-    M->iterations++;
-    qsort(M->maxArray, 11, sizeof(uint64_t), cmpint);
-    printMeas(txt,M,period);
-  }
-}
-
-#define initStaticTime(a) static __thread uint64_t a={0}
-#define pickStaticTime(a) do { a=rdtsc_oai(); } while (0)
-#define initRefTimes(a) static __thread Meas a= {0}
-static inline int cmpintRev(const void *a, const void *b) {
-  uint64_t *aa=(uint64_t *)a;
-  uint64_t *bb=(uint64_t *)b;
-  return (int)(*bb-*aa);
-}
-
-static inline void printMeas2(char *txt, Meas *M, int period, bool MaxMin) {
-  if (M->iterations%period == 0 ) {
-    char txt2[512];
-    sprintf(txt2,"%s avg=%" PRIu64 " iterations=%" PRIu64 " %s=%"
-            PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 "\n",
-            txt,
-            M->sum/M->iterations,
-            M->iterations,
-            MaxMin?"max":"min",
-            M->maxArray[1],M->maxArray[2], M->maxArray[3],M->maxArray[4], M->maxArray[5],
-            M->maxArray[6],M->maxArray[7], M->maxArray[8],M->maxArray[9],M->maxArray[10]);
-#if T_TRACER
-    LOG_W(PHY,"%s",txt2);
-#else
-    printf("%s",txt2);
-#endif
-  }
-}
-
-static inline void updateTimesReset(uint64_t start, Meas *M, int period, bool MaxMin, char *txt) {
-  if (start!=0) {
-    uint64_t end=rdtsc_oai();
-    long long diff=(end-start)/(cpuf*1000);
-    M->maxArray[0]=diff;
-    M->sum+=diff;
-    M->iterations++;
-
-    if ( MaxMin)
-      qsort(M->maxArray, 11, sizeof(uint64_t), cmpint);
-    else
-      qsort(M->maxArray, 11, sizeof(uint64_t), cmpintRev);
-
-    printMeas2(txt,M,period, MaxMin);
-
-    if (M->iterations%period == 0 ) {
-      bzero(M,sizeof(*M));
-
-      if (!MaxMin)
-        for (int i=0; i<11; i++)
-          M->maxArray[i]=INT_MAX;
-    }
-  }
-}
-
-static inline void measTransportTime(uint64_t DuSend, uint64_t CuMicroSec, Meas *M, int period, bool MaxMin, char *txt) {
-  if (DuSend!=0) {
-    uint64_t end=rdtsc_oai();
-    long long diff=(end-DuSend)/(cpuf*1000)-CuMicroSec;
-    M->maxArray[0]=diff;
-    M->sum+=diff;
-    M->iterations++;
-
-    if ( MaxMin)
-      qsort(M->maxArray, 11, sizeof(uint64_t), cmpint);
-    else
-      qsort(M->maxArray, 11, sizeof(uint64_t), cmpintRev);
-
-    printMeas2(txt,M,period, MaxMin);
-
-    if (M->iterations%period == 0 ) {
-      bzero(M,sizeof(*M));
-
-      if (!MaxMin)
-        for (int i=0; i<11; i++)
-          M->maxArray[i]=INT_MAX;
-    }
-  }
-}
-
-#define ceil16_bytes(a) ((((a+15)/16)*16)/8)
-
-static void fs6Dlunpack(void *out, void *in, int szUnpacked) {
-  static uint64_t *lut=NULL;
-
-  if (!lut) {
-    lut=(uint64_t *) malloc(sizeof(*lut)*256);
-
-    for (int i=0; i <256; i++)
-      for (int j=0; j<8; j++)
-        ((uint8_t *)(lut+i))[7-j]=(i>>j)&1;
-  }
-
-  int64_t *out_64 = (int64_t *)out;
-  int sz=ceil16_bytes(szUnpacked);
-
-  for (int i=0; i<sz; i++)
-    out_64[i]=lut[((uint8_t *)in)[i]];
-
-  return;
-}
-
-
-static void fs6Dlpack(void *out, void *in, int szUnpacked) {
-  __m128i zeros=_mm_set1_epi8(0);
-  __m128i shuffle=_mm_set_epi8(8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7);
-  const int loop=ceil16_bytes(szUnpacked)/sizeof(uint16_t);
-  __m128i *iter=(__m128i *)in;
-
-  for (int i=0; i < loop; i++) {
-    __m128i tmp=_mm_shuffle_epi8(_mm_cmpgt_epi8(*iter++,zeros),shuffle);
-    ((uint16_t *)out)[i]=(uint16_t)_mm_movemask_epi8(tmp);
-  }
-}
-
-void prach_eNB_tosplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc) {
-  fs6_ul_t *header=(fs6_ul_t *) commonUDPdata(bufferZone);
-
-  if (is_prach_subframe(&eNB->frame_parms, proc->frame_prach,proc->subframe_prach)<=0)
-    return;
-
-  RU_t *ru;
-  int aa=0;
-  int ru_aa;
-
-  for (int i=0; i<eNB->num_RU; i++) {
-    ru=eNB->RU_list[i];
-
-    for (ru_aa=0,aa=0; ru_aa<ru->nb_rx; ru_aa++,aa++) {
-      eNB->prach_vars.rxsigF[0][aa] = eNB->RU_list[i]->prach_rxsigF[0][ru_aa];
-      int ce_level;
-
-      for (ce_level=0; ce_level<4; ce_level++)
-        eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[i]->prach_rxsigF_br[ce_level][ru_aa];
-    }
-  }
-
-  ocp_rx_prach(eNB,
-               proc,
-               eNB->RU_list[0],
-               header->max_preamble,
-               header->max_preamble_energy,
-               header->max_preamble_delay,
-               header->avg_preamble_energy,
-               proc->frame_prach,
-               0,
-               false
-              );
-  // run PRACH detection for CE-level 0 only for now when br_flag is set
-  /* fixme: seems not operational and may overwrite regular LTE prach detection
-   * OAI code can call is sequence
-  rx_prach(eNB,
-           eNB->RU_list[0],
-           header->max_preamble,
-           header->max_preamble_energy,
-           header->max_preamble_delay,
-           header->avg_preamble_energy,
-           frame,
-           0,
-           true
-          );
-  */
-  LOG_D(PHY,"RACH detection index 0: max preamble: %u, energy: %u, delay: %u, avg energy: %u\n",
-        header->max_preamble[0],
-        header->max_preamble_energy[0],
-        header->max_preamble_delay[0],
-        header->avg_preamble_energy[0]
-       );
-  return;
-}
-
-void prach_eNB_fromsplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc) {
-  fs6_ul_t *header=(fs6_ul_t *) commonUDPdata(bufferZone);
-  uint16_t *max_preamble=header->max_preamble;
-  uint16_t *max_preamble_energy=header->max_preamble_energy;
-  uint16_t *max_preamble_delay=header->max_preamble_delay;
-  uint16_t *avg_preamble_energy=header->avg_preamble_energy;
-  int subframe=proc->subframe_prach;
-  int frame=proc->frame_prach;
-  // Fixme: not clear why we call twice with "br" and without
-  int br_flag=0;
-
-  if (br_flag==1) {
-    int             prach_mask;
-    prach_mask = is_prach_subframe (&eNB->frame_parms, proc->frame_prach_br, proc->subframe_prach_br);
-    eNB->UL_INFO.rach_ind_br.rach_indication_body.preamble_list = eNB->preamble_list_br;
-    int             ind = 0;
-    int             ce_level = 0;
-    /* Save for later, it doesn't work
-       for (int ind=0,ce_level=0;ce_level<4;ce_level++) {
-
-       if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1)&&
-       (prach_mask&(1<<(1+ce_level)) > 0) && // prach is active and CE level has finished its repetitions
-       (eNB->prach_vars_br.repetition_number[ce_level]==
-       eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level])) {
-
-    */
-
-    if (eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[0] == 1) {
-      if ((eNB->prach_energy_counter == 100) && (max_preamble_energy[0] > eNB->measurements.prach_I0 + eNB->prach_DTX_threshold_emtc[0])) {
-        eNB->UL_INFO.rach_ind_br.rach_indication_body.number_of_preambles++;
-        eNB->preamble_list_br[ind].preamble_rel8.timing_advance = max_preamble_delay[ind];      //
-        eNB->preamble_list_br[ind].preamble_rel8.preamble = max_preamble[ind];
-        // note: fid is implicitly 0 here, this is the rule for eMTC RA-RNTI from 36.321, Section 5.1.4
-        eNB->preamble_list_br[ind].preamble_rel8.rnti = 1 + subframe + (60*(eNB->prach_vars_br.first_frame[ce_level] % 40));
-        eNB->preamble_list_br[ind].instance_length = 0; //don't know exactly what this is
-        eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type = 1 + ce_level;    // CE Level
-        LOG_I (PHY, "Filling NFAPI indication for RACH %d CELevel %d (mask %x) : TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
-               ind,
-               ce_level,
-               prach_mask,
-               eNB->preamble_list_br[ind].preamble_rel8.timing_advance,
-               eNB->preamble_list_br[ind].preamble_rel8.preamble, eNB->preamble_list_br[ind].preamble_rel8.rnti, eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type);
-      }
-    }
-
-    /*
-      ind++;
-      }
-      } */// ce_level
-  } else if ((eNB->prach_energy_counter == 100) &&
-             (max_preamble_energy[0] > eNB->measurements.prach_I0+eNB->prach_DTX_threshold)) {
-    LOG_I(PHY,"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d\n",
-          eNB->Mod_id,
-          eNB->CC_id,
-          frame,
-          subframe,
-          max_preamble[0],
-          max_preamble_energy[0]/10,
-          max_preamble_energy[0]%10,
-          max_preamble_delay[0]);
-    pthread_mutex_lock(&eNB->UL_INFO_mutex);
-    eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles  = 1;
-    eNB->UL_INFO.rach_ind.rach_indication_body.preamble_list        = &eNB->preamble_list[0];
-    eNB->UL_INFO.rach_ind.rach_indication_body.tl.tag               = NFAPI_RACH_INDICATION_BODY_TAG;
-    eNB->UL_INFO.rach_ind.header.message_id                         = NFAPI_RACH_INDICATION;
-    eNB->UL_INFO.rach_ind.sfn_sf                                    = frame<<4 | subframe;
-    eNB->preamble_list[0].preamble_rel8.tl.tag                = NFAPI_PREAMBLE_REL8_TAG;
-    eNB->preamble_list[0].preamble_rel8.timing_advance        = max_preamble_delay[0];
-    eNB->preamble_list[0].preamble_rel8.preamble              = max_preamble[0];
-    eNB->preamble_list[0].preamble_rel8.rnti                  = 1+subframe;  // note: fid is implicitly 0 here
-    eNB->preamble_list[0].preamble_rel13.rach_resource_type   = 0;
-    eNB->preamble_list[0].instance_length                     = 0; //don't know exactly what this is
-
-    if (NFAPI_MODE==NFAPI_MODE_PNF) {  // If NFAPI PNF then we need to send the message to the VNF
-      LOG_D(PHY,"Filling NFAPI indication for RACH : SFN_SF:%d TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
-            NFAPI_SFNSF2DEC(eNB->UL_INFO.rach_ind.sfn_sf),
-            eNB->preamble_list[0].preamble_rel8.timing_advance,
-            eNB->preamble_list[0].preamble_rel8.preamble,
-            eNB->preamble_list[0].preamble_rel8.rnti,
-            eNB->preamble_list[0].preamble_rel13.rach_resource_type);
-      oai_nfapi_rach_ind(&eNB->UL_INFO.rach_ind);
-      eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 0;
-    }
-
-    pthread_mutex_unlock(&eNB->UL_INFO_mutex);
-  } // max_preamble_energy > prach_I0 + 100
-  else {
-    eNB->measurements.prach_I0 = ((eNB->measurements.prach_I0*900)>>10) + ((avg_preamble_energy[0]*124)>>10);
-
-    if (eNB->prach_energy_counter < 100)
-      eNB->prach_energy_counter++;
-  }
-}
-
-void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask,
-                   uint16_t rnti,
-                   int32_t stat) {
-  static int current_fsf=-1;
-  int fsf=frame*16+subframe;
-  uint8_t *bufferZone=eNB->FS6bufferZone;
-  commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
-  // move to the end
-  uint8_t *firstFreeByte=bufferZone;
-  int curBlock=0;
-
-  if ( current_fsf != fsf ) {
-    for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
-      AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
-      firstFreeByte+=alignedSize(firstFreeByte);
-      curBlock++;
-    }
-
-    commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
-    FirstUDPheader->nbBlocks++;
-    newUDPheader->blockID=curBlock;
-    newUDPheader->contentBytes=sizeof(fs6_ul_t)+sizeof(fs6_ul_uespec_uci_t);
-    hULUEuci(newUDPheader)->type=fs6ULcch;
-    hULUEuci(newUDPheader)->nb_active_ue=0;
-  } else
-    for (int i=0; i < FirstUDPheader->nbBlocks-1; i++) {
-      AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
-      firstFreeByte+=alignedSize(firstFreeByte);
-      curBlock++;
-    }
-
-  LOG_D(PHY,"FS6 du, block: %d: adding ul harq/sr: %d, rnti: %d, ueid: %d\n",
-        curBlock, type, rnti, UEid);
-  commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
-  fs6_ul_uespec_uci_element_t *tmp=(fs6_ul_uespec_uci_element_t *)(hULUEuci(newUDPheader)+1);
-  tmp+=hULUEuci(newUDPheader)->nb_active_ue;
-  tmp->type=type;
-  tmp->UEid=UEid;
-  tmp->frame=frame;
-  tmp->subframe=subframe;
-
-  if (uci != NULL)
-    memcpy(&tmp->uci, uci, sizeof(*uci));
-  else
-    tmp->uci.ue_id=0xFFFF;
-
-  if (harq_ack != NULL)
-    memcpy(tmp->harq_ack, harq_ack, 4);
-
-  tmp->tdd_mapping_mode=tdd_mapping_mode;
-  tmp->tdd_multiplexing_mask=tdd_multiplexing_mask;
-  tmp->n0_subband_power_dB=eNB->measurements.n0_subband_power_dB[0][0];
-  tmp->rnti=rnti;
-  tmp->stat=stat;
-  hULUEuci(newUDPheader)->nb_active_ue++;
-  newUDPheader->contentBytes+=sizeof(fs6_ul_uespec_uci_element_t);
-}
-
-
-void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
-  uint8_t *bufferZone=eNB->FS6bufferZone;
-  commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
-  // move to the end
-  uint8_t *firstFreeByte=bufferZone;
-  int curBlock=0;
-
-  for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
-    AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
-    firstFreeByte+=alignedSize(firstFreeByte);
-    curBlock++;
-  }
-
-  commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
-  FirstUDPheader->nbBlocks++;
-  newUDPheader->blockID=curBlock;
-  newUDPheader->contentBytes=sizeof(fs6_ul_t)+sizeof(fs6_ul_uespec_t) + dataLen;
-  hULUE(newUDPheader)->type=fs6ULsch;
-  hULUE(newUDPheader)->UE_id=UE_id;
-  hULUE(newUDPheader)->harq_id=harq_pid;
-  memcpy(hULUE(newUDPheader)->ulsch_power,
-         eNB->pusch_vars[UE_id]->ulsch_power,
-         sizeof(int)*2);
-  hULUE(newUDPheader)->cqi_crc_status=eNB->ulsch[UE_id]->harq_processes[harq_pid]->cqi_crc_status;
-  hULUE(newUDPheader)->O_ACK=eNB->ulsch[UE_id]->harq_processes[harq_pid]->O_ACK;
-  memcpy(hULUE(newUDPheader)->o_ACK, eNB->ulsch[UE_id]->harq_processes[harq_pid]->o_ACK,
-         sizeof(eNB->ulsch[UE_id]->harq_processes[harq_pid]->o_ACK));
-  hULUE(newUDPheader)->ta=lte_est_timing_advance_pusch(&eNB->frame_parms, eNB->pusch_vars[UE_id]->drs_ch_estimates_time);
-  hULUE(newUDPheader)->segment=segmentID;
-  memcpy(hULUE(newUDPheader)->o, eNB->ulsch[UE_id]->harq_processes[harq_pid]->o,
-         sizeof(eNB->ulsch[UE_id]->harq_processes[harq_pid]->o));
-  memcpy(hULUE(newUDPheader)+1, data, dataLen);
-  hULUE(newUDPheader)->segLen=dataLen;
-  hULUE(newUDPheader)->r_offset=r_offset;
-  hULUE(newUDPheader)->G=eNB->ulsch[UE_id]->harq_processes[harq_pid]->G;
-}
-
-void pusch_procedures_tosplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
-  uint32_t harq_pid;
-  LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
-  const int subframe = proc->subframe_rx;
-  const int frame    = proc->frame_rx;
-
-  for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
-    LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[i];
-
-    if (ulsch->ue_type > NOCE)
-      harq_pid = 0;
-    else
-      harq_pid= subframe2harq_pid(&eNB->frame_parms,frame,subframe);
-
-    LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
-
-    if (ulsch->rnti>0)
-      LOG_D(PHY,"eNB->ulsch[%d]->harq_processes[harq_pid:%d] SFN/SF:%04d%d: PUSCH procedures, UE %d/%x ulsch_harq[status:%d SFN/SF:%04d%d active: %d handled:%d]\n",
-            i, harq_pid, frame,subframe,i,ulsch->rnti,
-            ulsch_harq->status, ulsch_harq->frame, ulsch_harq->subframe, ulsch_harq->status, ulsch_harq->handled);
-
-    if ((ulsch) &&
-        (ulsch->rnti>0) &&
-        (ulsch_harq->status == ACTIVE) &&
-        ((ulsch_harq->frame == frame)     || (ulsch_harq->repetition_number >1) ) &&
-        ((ulsch_harq->subframe == subframe) || (ulsch_harq->repetition_number >1) ) &&
-        (ulsch_harq->handled == 0)) {
-      // UE has ULSCH scheduling
-      for (int rb=0;
-           rb<=ulsch_harq->nb_rb;
-           rb++) {
-        int rb2 = rb+ulsch_harq->first_rb;
-        eNB->rb_mask_ul[rb2>>5] |= (1<<(rb2&31));
-      }
-
-      LOG_D(PHY,"[eNB %d] frame %d, subframe %d: Scheduling ULSCH Reception for UE %d \n",
-            eNB->Mod_id, frame, subframe, i);
-      uint8_t nPRS= fp->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[subframe<<1];
-      ulsch->cyclicShift = (ulsch_harq->n_DMRS2 +
-                            fp->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift +
-                            nPRS)%12;
-      AssertFatal(ulsch_harq->TBS>0,"illegal TBS %d\n",ulsch_harq->TBS);
-      LOG_D(PHY,
-            "[eNB %d][PUSCH %d] Frame %d Subframe %d Demodulating PUSCH: dci_alloc %d, rar_alloc %d, round %d, first_rb %d, nb_rb %d, Qm %d, TBS %d, rv %d, cyclic_shift %d (n_DMRS2 %d, cyclicShift_common %d, ), O_ACK %d, beta_cqi %d \n",
-            eNB->Mod_id,harq_pid,frame,subframe,
-            ulsch_harq->dci_alloc,
-            ulsch_harq->rar_alloc,
-            ulsch_harq->round,
-            ulsch_harq->first_rb,
-            ulsch_harq->nb_rb,
-            ulsch_harq->Qm,
-            ulsch_harq->TBS,
-            ulsch_harq->rvidx,
-            ulsch->cyclicShift,
-            ulsch_harq->n_DMRS2,
-            fp->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift,
-            ulsch_harq->O_ACK,
-            ulsch->beta_offset_cqi_times8);
-      start_meas(&eNB->ulsch_demodulation_stats);
-      eNB->FS6bufferZone=bufferZone;
-      rx_ulsch(eNB, proc, i);
-      stop_meas(&eNB->ulsch_demodulation_stats);
-      // TBD: add datablock for transmission
-      start_meas(&eNB->ulsch_decoding_stats);
-      ulsch_decoding(eNB,proc,
-                     i,
-                     0, // control_only_flag
-                     ulsch_harq->V_UL_DAI,
-                     ulsch_harq->nb_rb>20 ? 1 : 0);
-      stop_meas(&eNB->ulsch_decoding_stats);
-    }
-  }
-}
-
-void phy_procedures_eNB_uespec_RX_tosplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
-  //RX processing for ue-specific resources
-  LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
-  const int       subframe = proc->subframe_rx;
-  const int       frame = proc->frame_rx;
-  /* TODO: use correct rxdata */
-
-  if ((fp->frame_type == TDD) && (subframe_select(fp,subframe)!=SF_UL)) return;
-
-  LOG_D (PHY, "[eNB %d] Frame %d: Doing phy_procedures_eNB_uespec_RX(%d)\n", eNB->Mod_id, frame, subframe);
-  eNB->rb_mask_ul[0] = 0;
-  eNB->rb_mask_ul[1] = 0;
-  eNB->rb_mask_ul[2] = 0;
-  eNB->rb_mask_ul[3] = 0;
-  // Fix me here, these should be locked
-  eNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus  = 0;
-  eNB->UL_INFO.crc_ind.crc_indication_body.number_of_crcs = 0;
-  // Call SRS first since all others depend on presence of SRS or lack thereof
-  srs_procedures (eNB, proc);
-  eNB->first_run_I0_measurements = 0;
-  uci_procedures (eNB, proc);
-
-  if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) { // If PNF or monolithic
-    pusch_procedures_tosplit(bufferZone, bufSize, eNB,proc);
-  }
-
-  lte_eNB_I0_measurements (eNB, subframe, 0, eNB->first_run_I0_measurements);
-  int min_I0=1000,max_I0=0;
-
-  if ((frame==0) && (subframe==4)) {
-    for (int i=0; i<eNB->frame_parms.N_RB_UL; i++) {
-      if (i==(eNB->frame_parms.N_RB_UL>>1) - 1) i+=2;
-
-      if (eNB->measurements.n0_subband_power_tot_dB[i]<min_I0)
-        min_I0 = eNB->measurements.n0_subband_power_tot_dB[i];
-
-      if (eNB->measurements.n0_subband_power_tot_dB[i]>max_I0)
-        max_I0 = eNB->measurements.n0_subband_power_tot_dB[i];
-    }
-
-    LOG_I (PHY, "max_I0 %d, min_I0 %d\n", max_I0, min_I0);
-  }
-
-  return;
-}
-
-
-void fill_rx_indication_from_split(uint8_t *bufferZone, PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe, ul_propagation_t *ul_propa) {
-  nfapi_rx_indication_pdu_t *pdu;
-  int             timing_advance_update;
-  uint32_t        harq_pid;
-
-  if (eNB->ulsch[UE_id]->ue_type > 0)
-    harq_pid = 0;
-  else
-    harq_pid = subframe2harq_pid (&eNB->frame_parms,
-                                  frame, subframe);
-
-  pthread_mutex_lock(&eNB->UL_INFO_mutex);
-  eNB->UL_INFO.rx_ind.sfn_sf                    = frame<<4| subframe;
-  eNB->UL_INFO.rx_ind.rx_indication_body.tl.tag = NFAPI_RX_INDICATION_BODY_TAG;
-  pdu                                    = &eNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list[eNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus];
-  //  pdu->rx_ue_information.handle          = eNB->ulsch[UE_id]->handle;
-  pdu->rx_ue_information.tl.tag          = NFAPI_RX_UE_INFORMATION_TAG;
-  pdu->rx_ue_information.rnti            = eNB->ulsch[UE_id]->rnti;
-  pdu->rx_indication_rel8.tl.tag         = NFAPI_RX_INDICATION_REL8_TAG;
-  pdu->rx_indication_rel8.length         = eNB->ulsch[UE_id]->harq_processes[harq_pid]->TBS>>3;
-  pdu->rx_indication_rel8.offset         = 1;   // DJP - I dont understand - but broken unless 1 ????  0;  // filled in at the end of the UL_INFO formation
-  AssertFatal(pdu->rx_indication_rel8.length <= NFAPI_RX_IND_DATA_MAX, "Invalid PDU len %d\n",
-              pdu->rx_indication_rel8.length);
-  memcpy(pdu->rx_ind_data,
-         eNB->ulsch[UE_id]->harq_processes[harq_pid]->decodedBytes,
-         pdu->rx_indication_rel8.length);
-  // estimate timing advance for MAC
-  timing_advance_update                  = ul_propa[UE_id].ta;
-
-  //  if (timing_advance_update > 10) { dump_ulsch(eNB,frame,subframe,UE_id); exit(-1);}
-  //  if (timing_advance_update < -10) { dump_ulsch(eNB,frame,subframe,UE_id); exit(-1);}
-  switch (eNB->frame_parms.N_RB_DL) {
-    case 6:                      /* nothing to do */
-      break;
-
-    case 15:
-      timing_advance_update /= 2;
-      break;
-
-    case 25:
-      timing_advance_update /= 4;
-      break;
-
-    case 50:
-      timing_advance_update /= 8;
-      break;
-
-    case 75:
-      timing_advance_update /= 12;
-      break;
-
-    case 100:
-      timing_advance_update /= 16;
-      break;
-
-    default:
-      abort ();
-  }
-
-  // put timing advance command in 0..63 range
-  timing_advance_update += 31;
-
-  if (timing_advance_update < 0)
-    timing_advance_update = 0;
-
-  if (timing_advance_update > 63)
-    timing_advance_update = 63;
-
-  pdu->rx_indication_rel8.timing_advance = timing_advance_update;
-  // estimate UL_CQI for MAC (from antenna port 0 only)
-  int SNRtimes10 = dB_fixed_times10(eNB->pusch_vars[UE_id]->ulsch_power[0]) - 10 * eNB->measurements.n0_subband_power_dB[0][0];
-
-  if (SNRtimes10 < -640)
-    pdu->rx_indication_rel8.ul_cqi = 0;
-  else if (SNRtimes10 > 635)
-    pdu->rx_indication_rel8.ul_cqi = 255;
-  else
-    pdu->rx_indication_rel8.ul_cqi = (640 + SNRtimes10) / 5;
-
-  LOG_D(PHY,"[PUSCH %d] Frame %d Subframe %d Filling RX_indication with SNR %d (%d), timing_advance %d (update %d)\n",
-        harq_pid,frame,subframe,SNRtimes10,pdu->rx_indication_rel8.ul_cqi,pdu->rx_indication_rel8.timing_advance,
-        timing_advance_update);
-  eNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus++;
-  eNB->UL_INFO.rx_ind.sfn_sf = frame<<4 | subframe;
-  pthread_mutex_unlock(&eNB->UL_INFO_mutex);
-}
-
-void pusch_procedures_fromsplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, ul_propagation_t *ul_propa) {
-  //LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
-  const int subframe = proc->subframe_rx;
-  const int frame    = proc->frame_rx;
-  uint32_t harq_pid;
-  uint32_t harq_pid0 = subframe2harq_pid(&eNB->frame_parms,frame,subframe);
-
-  for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
-    LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[i];
-
-    if (ulsch->ue_type > NOCE) harq_pid = 0;
-    else harq_pid=harq_pid0;
-
-    LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
-
-    if (ulsch->rnti>0)
-      LOG_D(PHY,"eNB->ulsch[%d]->harq_processes[harq_pid:%d] SFN/SF:%04d%d: PUSCH procedures, UE %d/%x ulsch_harq[status:%d SFN/SF:%04d%d handled:%d]\n",
-            i, harq_pid, frame,subframe,i,ulsch->rnti,
-            ulsch_harq->status, ulsch_harq->frame, ulsch_harq->subframe, ulsch_harq->handled);
-
-    if ((ulsch) &&
-        (ulsch->rnti>0) &&
-        (ulsch_harq->status == ACTIVE) &&
-        (ulsch_harq->frame == frame) &&
-        (ulsch_harq->subframe == subframe) &&
-        (ulsch_harq->handled == 0)) {
-      // UE has ULSCH scheduling
-      for (int rb=0;
-           rb<=ulsch_harq->nb_rb;
-           rb++) {
-        int rb2 = rb+ulsch_harq->first_rb;
-        eNB->rb_mask_ul[rb2>>5] |= (1<<(rb2&31));
-      }
-
-      start_meas(&eNB->ulsch_decoding_stats);
-      // This is a new packet, so compute quantities regarding segmentation
-      ulsch_harq->B = ulsch_harq->TBS+24;
-      lte_segmentation(NULL,
-                       NULL,
-                       ulsch_harq->B,
-                       &ulsch_harq->C,
-                       &ulsch_harq->Cplus,
-                       &ulsch_harq->Cminus,
-                       &ulsch_harq->Kplus,
-                       &ulsch_harq->Kminus,
-                       &ulsch_harq->F);
-      ulsch_decoding_data(eNB, proc, i, harq_pid,
-                          ulsch_harq->nb_rb>20 ? 1 : 0);
-      stop_meas(&eNB->ulsch_decoding_stats);
-    } //     if ((ulsch) &&
-    //         (ulsch->rnti>0) &&
-    //         (ulsch_harq->status == ACTIVE))
-    else if ((ulsch) &&
-             (ulsch->rnti>0) &&
-             (ulsch_harq->status == ACTIVE) &&
-             (ulsch_harq->frame == frame) &&
-             (ulsch_harq->subframe == subframe) &&
-             (ulsch_harq->handled == 1)) {
-      // this harq process is stale, kill it, this 1024 frames later (10s), consider reducing that
-      ulsch_harq->status = SCH_IDLE;
-      ulsch_harq->handled = 0;
-      ulsch->harq_mask &= ~(1 << harq_pid);
-      LOG_W (PHY, "Removing stale ULSCH config for UE %x harq_pid %d (harq_mask is now 0x%2.2x)\n", ulsch->rnti, harq_pid, ulsch->harq_mask);
-    }
-  }   //   for (i=0; i<NUMBER_OF_UE_MAX; i++)
-
-  while (proc->nbDecode > 0) {
-    notifiedFIFO_elt_t *req=pullTpool(proc->respDecode, proc->threadPool);
-    if (req == NULL)
-      break; // Tpool has been stopped
-    postDecode(proc, req);
-    delNotifiedFIFO_elt(req);
-  }
-}
-
-void recvFs6Ul(uint8_t *bufferZone, int nbBlocks, PHY_VARS_eNB *eNB, ul_propagation_t *ul_propa) {
-  void *bufPtr=bufferZone;
-
-  for (int i=0; i < nbBlocks; i++) { //nbBlocks is the actual received blocks
-    if ( ((commonUDP_t *)bufPtr)->contentBytes > sizeof(fs6_ul_t) ) {
-      int type=hULUE(bufPtr)->type;
-
-      if ( type == fs6ULsch)  {
-        LTE_eNB_ULSCH_t *ulsch =eNB->ulsch[hULUE(bufPtr)->UE_id];
-        LTE_UL_eNB_HARQ_t *ulsch_harq=ulsch->harq_processes[hULUE(bufPtr)->harq_id];
-        memcpy(ulsch_harq->eUL+hULUE(bufPtr)->r_offset,
-               hULUE(bufPtr)+1,
-               hULUE(bufPtr)->segLen);
-        memcpy(eNB->pusch_vars[hULUE(bufPtr)->UE_id]->ulsch_power,
-               hULUE(bufPtr)->ulsch_power,
-               sizeof(int)*2);
-        ulsch_harq->G=hULUE(bufPtr)->G;
-        ulsch_harq->cqi_crc_status=hULUE(bufPtr)->cqi_crc_status;
-        //ulsch_harq->O_ACK= hULUE(bufPtr)->O_ACK;
-        memcpy(ulsch_harq->o_ACK, hULUE(bufPtr)->o_ACK,
-               sizeof(ulsch_harq->o_ACK));
-        memcpy(ulsch_harq->o,hULUE(bufPtr)->o, sizeof(ulsch_harq->o));
-        ul_propa[hULUE(bufPtr)->UE_id].ta=hULUE(bufPtr)->ta;
-        LOG_D(PHY,"Received ulsch data for: rnti:%x, cqi_crc_status %d O_ACK: %d, segment: %d, seglen: %d  \n",
-              ulsch->rnti, ulsch_harq->cqi_crc_status, ulsch_harq->O_ACK,hULUE(bufPtr)->segment, hULUE(bufPtr)->segLen);
-      } else if ( type == fs6ULcch ) {
-        int nb_uci=hULUEuci(bufPtr)->nb_active_ue;
-        fs6_ul_uespec_uci_element_t *tmp=(fs6_ul_uespec_uci_element_t *)(hULUEuci(bufPtr)+1);
-
-        for (int j=0; j < nb_uci ; j++) {
-          LOG_D(PHY,"FS6 cu, block: %d/%d: received ul harq/sr: %d, rnti: %d, ueid: %d\n",
-                i, j, type, tmp->rnti, tmp->UEid);
-          eNB->measurements.n0_subband_power_dB[0][0]=tmp->n0_subband_power_dB;
-
-          if (tmp->uci.ue_id != 0xFFFF)
-            memcpy(&eNB->uci_vars[tmp->UEid],&tmp->uci, sizeof(tmp->uci));
-
-          if ( tmp->type == fs6ULindicationHarq )
-            fill_uci_harq_indication (tmp->UEid, eNB, &eNB->uci_vars[tmp->UEid],
-                                      tmp->frame, tmp->subframe, tmp->harq_ack,
-                                      tmp->tdd_mapping_mode, tmp->tdd_multiplexing_mask);
-          else if ( tmp->type == fs6ULindicationSr )
-            fill_sr_indication(tmp->UEid, eNB,tmp->rnti,tmp->frame,tmp->subframe,tmp->stat);
-          else
-            LOG_E(PHY, "Split FS6: impossible UL harq type\n");
-
-          tmp++;
-        }
-      } else
-        LOG_E(PHY, "FS6 ul packet type impossible\n" );
-    }
-
-    bufPtr+=alignedSize(bufPtr);
-  }
-}
-
-void phy_procedures_eNB_uespec_RX_fromsplit(uint8_t *bufferZone, int nbBlocks,PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc) {
-  // The configuration arrived in Dl, so we can extract the UL data
-  ul_propagation_t ul_propa[NUMBER_OF_UE_MAX];
-  recvFs6Ul(bufferZone, nbBlocks, eNB, ul_propa);
-
-  // dirty memory allocation in OAI...
-  for (int i = 0; i < NUMBER_OF_UCI_MAX; i++)
-    if ( eNB->uci_vars[i].frame == proc->frame_rx &&
-         eNB->uci_vars[i].subframe == proc->subframe_rx )
-      eNB->uci_vars[i].active=0;
-
-  pusch_procedures_fromsplit(bufferZone, nbBlocks, eNB, proc, ul_propa);
-}
-
-void rcvFs6DL(uint8_t *bufferZone, int nbBlocks, PHY_VARS_eNB *eNB, int frame, int subframe) {
-  void *bufPtr=bufferZone;
-
-  for (int i=0; i < nbBlocks; i++) { //nbBlocks is the actual received blocks
-    if ( ((commonUDP_t *)bufPtr)->contentBytes > sizeof(fs6_dl_t) ) {
-      int type=hDLUE(bufPtr)->type;
-
-      if ( type == fs6DlConfig) {
-        int curUE=hDLUE(bufPtr)->UE_id;
-        LTE_eNB_DLSCH_t *dlsch0 = eNB->dlsch[curUE][0];
-        LTE_DL_eNB_HARQ_t *dlsch_harq=dlsch0->harq_processes[hDLUE(bufPtr)->harq_pid];
-#ifdef PHY_TX_THREAD
-        dlsch0->active[subframe] = 1;
-#else
-        dlsch0->active = 1;
-#endif
-        dlsch0->harq_ids[frame%2][subframe]=hDLUE(bufPtr)->harq_pid;
-        dlsch0->rnti=hDLUE(bufPtr)->rnti;
-        dlsch0->sqrt_rho_a=hDLUE(bufPtr)->sqrt_rho_a;
-        dlsch0->sqrt_rho_b=hDLUE(bufPtr)->sqrt_rho_b;
-        dlsch_harq->nb_rb=hDLUE(bufPtr)->nb_rb;
-        memcpy(dlsch_harq->rb_alloc, hDLUE(bufPtr)->rb_alloc, sizeof(hDLUE(bufPtr)->rb_alloc));
-        dlsch_harq->Qm=hDLUE(bufPtr)->Qm;
-        dlsch_harq->Nl=hDLUE(bufPtr)->Nl;
-        dlsch_harq->pdsch_start=hDLUE(bufPtr)->pdsch_start;
-#ifdef PHY_TX_THREAD
-        dlsch_harq->CEmode = hDLUE(bufPtr)->CEmode;
-        dlsch_harq->i0=hDLUE(bufPtr)->i0;
-        dlsch_harq->sib1_br_flag=hDLUE(bufPtr)->sib1_br_flag;
-#else
-        dlsch0->i0=hDLUE(bufPtr)->i0;
-        dlsch0->sib1_br_flag=hDLUE(bufPtr)->sib1_br_flag;
-#endif
-        fs6Dlunpack(dlsch_harq->eDL,
-                    hDLUE(bufPtr)+1, hDLUE(bufPtr)->dataLen);
-        LOG_D(PHY,"received %d bits, in harq id: %di fsf: %d.%d, sum %d\n",
-              hDLUE(bufPtr)->dataLen, hDLUE(bufPtr)->harq_pid, frame, subframe, sum(dlsch_harq->eDL, hDLUE(bufPtr)->dataLen));
-      } else if (type == fs6UlConfig) {
-        int nbUE=(((commonUDP_t *)bufPtr)->contentBytes - sizeof(fs6_dl_t)) / sizeof( fs6_dl_ulsched_t ) ;
-#define cpyVal(a) memcpy(&ulsch_harq->a,&hTxULUE(bufPtr)->a, sizeof(ulsch_harq->a))
-
-        for ( int i=0; i < nbUE; i++ ) {
-          int curUE=hTxULUE(bufPtr)->UE_id;
-          LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[curUE];
-          LTE_UL_eNB_HARQ_t *ulsch_harq=ulsch->harq_processes[hTxULUE(bufPtr)->harq_pid];
-          ulsch->ue_type=hTxULUE(bufPtr)->ue_type;
-          ulsch->harq_mask=hTxULUE(bufPtr)->harq_mask;
-          ulsch->Mlimit=hTxULUE(bufPtr)->Mlimit;
-          ulsch->max_turbo_iterations=hTxULUE(bufPtr)->max_turbo_iterations;
-          ulsch->bundling=hTxULUE(bufPtr)->bundling;
-          ulsch->beta_offset_cqi_times8=hTxULUE(bufPtr)->beta_offset_cqi_times8;
-          ulsch->beta_offset_ri_times8=hTxULUE(bufPtr)->beta_offset_ri_times8;
-          ulsch->beta_offset_harqack_times8=hTxULUE(bufPtr)->beta_offset_harqack_times8;
-          ulsch->Msg3_active=hTxULUE(bufPtr)->Msg3_active;
-          ulsch->cyclicShift=hTxULUE(bufPtr)->cyclicShift;
-          ulsch->cooperation_flag=hTxULUE(bufPtr)->cooperation_flag;
-          ulsch->num_active_cba_groups=hTxULUE(bufPtr)->num_active_cba_groups;
-          memcpy(ulsch->cba_rnti,hTxULUE(bufPtr)->cba_rnti,sizeof(ulsch->cba_rnti));//NUM_MAX_CBA_GROUP];
-          ulsch->rnti=hTxULUE(bufPtr)->rnti;
-          ulsch_harq->nb_rb=hTxULUE(bufPtr)->nb_rb;
-          ulsch_harq->handled=0;
-          ulsch_harq->status = ACTIVE;
-          ulsch_harq->frame = frame;
-          ulsch_harq->subframe = subframe;
-          ulsch_harq->first_rb=hTxULUE(bufPtr)->first_rb;
-          ulsch_harq->O_RI=hTxULUE(bufPtr)->O_RI;
-          ulsch_harq->Or1=hTxULUE(bufPtr)->Or1;
-          ulsch_harq->Msc_initial=hTxULUE(bufPtr)->Msc_initial;
-          ulsch_harq->Nsymb_initial=hTxULUE(bufPtr)->Nsymb_initial;
-          ulsch_harq->V_UL_DAI=hTxULUE(bufPtr)->V_UL_DAI;
-          ulsch_harq->Qm=hTxULUE(bufPtr)->Qm;
-          ulsch_harq->srs_active=hTxULUE(bufPtr)->srs_active;
-          ulsch_harq->TBS=hTxULUE(bufPtr)->TBS;
-          ulsch_harq->Nsymb_pusch=hTxULUE(bufPtr)->Nsymb_pusch;
-          cpyVal(dci_alloc);
-          cpyVal(rar_alloc);
-          cpyVal(status);
-          cpyVal(Msg3_flag);
-          cpyVal(phich_active);
-          cpyVal(phich_ACK);
-          cpyVal(previous_first_rb);
-          cpyVal(B);
-          cpyVal(G);
-          //cpyVal(o);
-          cpyVal(uci_format);
-          cpyVal(Or2);
-          cpyVal(o_RI);
-          cpyVal(o_ACK);
-          cpyVal(O_ACK);
-          //cpyVal(q);
-          cpyVal(o_RCC);
-          cpyVal(q_ACK);
-          cpyVal(q_RI);
-          cpyVal(RTC);
-          cpyVal(ndi);
-          cpyVal(round);
-          cpyVal(rvidx);
-          cpyVal(Nl);
-          cpyVal(n_DMRS);
-          cpyVal(previous_n_DMRS);
-          cpyVal(n_DMRS2);
-          cpyVal(delta_TF);
-          cpyVal(repetition_number );
-          cpyVal(total_number_of_repetitions);
-          LOG_D(PHY,"Received request to perform ulsch for: rnti:%d, fsf: %d/%d, O_ACK: %d\n",
-                ulsch->rnti, frame, subframe, ulsch_harq->O_ACK);
-        }
-      } else if ( type == fs6ULConfigCCH ) {
-        fs6_dl_uespec_ulcch_element_t *tmp=(fs6_dl_uespec_ulcch_element_t *)(hTxULcch(bufPtr)+1);
-
-        for (int i=0; i< hTxULcch(bufPtr)->nb_active_ue; i++ )
-          memcpy(&eNB->uci_vars[tmp->UE_id], &tmp->cch_vars, sizeof(tmp->cch_vars));
-      }  else
-        LOG_E(PHY, "Impossible block in fs6 DL\n");
-    }
-
-    bufPtr+=alignedSize(bufPtr);
-  }
-}
-
-void phy_procedures_eNB_TX_fromsplit(uint8_t *bufferZone, int nbBlocks, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, int do_meas ) {
-  LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
-  int subframe=proc->subframe_tx;
-  int frame=proc->frame_tx;
-  //LTE_UL_eNB_HARQ_t *ulsch_harq;
-  eNB->pdcch_vars[subframe&1].num_pdcch_symbols=hDL(bufferZone)->num_pdcch_symbols;
-  eNB->pdcch_vars[subframe&1].num_dci=hDL(bufferZone)->num_dci;
-  uint8_t num_mdci = eNB->mpdcch_vars[subframe&1].num_dci = hDL(bufferZone)->num_mdci;
-  eNB->pbch_configured=true;
-  memcpy(eNB->pbch_pdu,hDL(bufferZone)->pbch_pdu, 4);
-
-  // Remove all scheduled DL, we will populate from the CU sending
-  for (int UE_id=0; UE_id<NUMBER_OF_DLSCH_MAX; UE_id++) {
-    LTE_eNB_DLSCH_t *dlsch0 = eNB->dlsch[UE_id][0];
-
-    if ( dlsch0 && dlsch0->rnti>0 ) {
-#ifdef PHY_TX_THREAD
-      dlsch0->active[subframe] = 0;
-#else
-      dlsch0->active = 0;
-#endif
-    }
-  }
-
-  rcvFs6DL(bufferZone, nbBlocks, eNB, frame, subframe);
-
-  if (do_meas==1) {
-    start_meas(&eNB->phy_proc_tx);
-    start_meas(&eNB->dlsch_common_and_dci);
-  }
-
-  // clear the transmit data array for the current subframe
-  for (int aa = 0; aa < fp->nb_antenna_ports_eNB; aa++) {
-    memset (&eNB->common_vars.txdataF[aa][subframe * fp->ofdm_symbol_size * (fp->symbols_per_tti)],
-            0, fp->ofdm_symbol_size * (fp->symbols_per_tti) * sizeof (int32_t));
-  }
-
-  if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
-    if (is_pmch_subframe(frame,subframe,fp)) {
-      pmch_procedures(eNB,proc,0);
-    } else {
-      // this is not a pmch subframe, so generate PSS/SSS/PBCH
-      common_signal_procedures(eNB,frame, subframe);
-    }
-  }
-
-  // clear previous allocation information for all UEs
-  for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
-    //if (eNB->dlsch[i][0])
-    //eNB->dlsch[i][0]->subframe_tx[subframe] = 0;
-  }
-
-  if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
-    for (int i=0; i< hDL(bufferZone)->num_dci; i++)
-      eNB->pdcch_vars[subframe&1].dci_alloc[i]=hDL(bufferZone)->dci_alloc[i];
-
-    LOG_D (PHY, "Frame %d, subframe %d: Calling generate_dci_top (pdcch) (num_dci %" PRIu8 ")\n", frame, subframe, hDL(bufferZone)->num_dci);
-    generate_dci_top(hDL(bufferZone)->num_pdcch_symbols,
-                     hDL(bufferZone)->num_dci,
-                     &eNB->pdcch_vars[subframe&1].dci_alloc[0],
-                     0,
-                     hDL(bufferZone)->amp,
-                     fp,
-                     eNB->common_vars.txdataF,
-                     subframe);
-
-    if (num_mdci > 0) {
-      LOG_D (PHY, "[eNB %" PRIu8 "] Frame %d, subframe %d: Calling generate_mdci_top (mpdcch) (num_dci %" PRIu8 ")\n", eNB->Mod_id, frame, subframe, num_mdci);
-      generate_mdci_top (eNB, frame, subframe, AMP, eNB->common_vars.txdataF);
-    }
-  }
-
-  for (int UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
-    LTE_eNB_DLSCH_t *dlsch0 = eNB->dlsch[UE_id][0];
-    LTE_eNB_DLSCH_t *dlsch1 = eNB->dlsch[UE_id][1];
-
-    if ((dlsch0)&&(dlsch0->rnti>0)&&
-#ifdef PHY_TX_THREAD
-        (dlsch0->active[subframe] == 1)
-#else
-        (dlsch0->active == 1)
-#endif
-       ) {
-      uint64_t sum=0;
-
-      for ( int i= subframe * fp->ofdm_symbol_size * (fp->symbols_per_tti);
-            i< (subframe+1) * fp->ofdm_symbol_size * (fp->symbols_per_tti);
-            i++)
-        sum+=((int32_t *)(eNB->common_vars.txdataF[0]))[i];
-
-      LOG_D(PHY,"frame: %d, subframe: %d, sum of dlsch mod v1: %lx\n", frame, subframe, sum);
-      int harq_pid=dlsch0->harq_ids[frame%2][subframe];
-      pdsch_procedures(eNB,
-                       proc,
-                       harq_pid,
-                       dlsch0,
-                       dlsch1);
-    }
-  }
-
-  eNB->phich_vars[subframe&1]=hDL(bufferZone)->phich_vars;
-  generate_phich_top(eNB,
-                     proc,
-                     AMP);
-}
-
-#define cpyToDu(a) hTxULUE(newUDPheader)->a=ulsch->a
-#define cpyToDuHarq(a) hTxULUE(newUDPheader)->a=ulsch_harq->a
-#define memcpyToDuHarq(a) memcpy(&hTxULUE(newUDPheader)->a,&ulsch_harq->a, sizeof(ulsch_harq->a));
-
-void appendFs6TxULUE(uint8_t *bufferZone, LTE_DL_FRAME_PARMS *fp, int curUE, LTE_eNB_ULSCH_t *ulsch, int frame, int subframe) {
-  commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
-  // move to the end
-  uint8_t *firstFreeByte=bufferZone;
-  int curBlock=0;
-
-  for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
-    AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
-    firstFreeByte+=alignedSize(firstFreeByte);
-    curBlock++;
-  }
-
-  commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
-  FirstUDPheader->nbBlocks++;
-  newUDPheader->blockID=curBlock;
-  newUDPheader->contentBytes=sizeof(fs6_dl_t)+sizeof(fs6_dl_ulsched_t);
-  // We skip the fs6 DL header, that is populated by caller
-  // This header will be duplicated during sending
-  hTxULUE(newUDPheader)->type=fs6UlConfig;
-  hTxULUE(newUDPheader)->UE_id=curUE;
-  int harq_pid;
-
-  if (ulsch->ue_type > NOCE)
-    // LTE-M case
-    harq_pid = 0;
-  else
-    harq_pid = subframe2harq_pid(fp, frame, subframe);
-
-  LTE_UL_eNB_HARQ_t *ulsch_harq=ulsch->harq_processes[harq_pid];
-  hTxULUE(newUDPheader)->harq_pid=harq_pid;
-  cpyToDu(ue_type);
-  cpyToDu(harq_mask);
-  cpyToDu(Mlimit);
-  cpyToDu(max_turbo_iterations);
-  cpyToDu(bundling);
-  cpyToDu(beta_offset_cqi_times8);
-  cpyToDu(beta_offset_ri_times8);
-  cpyToDu(beta_offset_harqack_times8);
-  cpyToDu(Msg3_active);
-  cpyToDu(cyclicShift);
-  cpyToDu(cooperation_flag);
-  cpyToDu(num_active_cba_groups);
-  memcpy(hTxULUE(newUDPheader)->cba_rnti,ulsch->cba_rnti,sizeof(ulsch->cba_rnti));//NUM_MAX_CBA_GROUP];
-  cpyToDu(rnti);
-  cpyToDuHarq(nb_rb);
-  cpyToDuHarq(Msc_initial);
-  cpyToDuHarq(Nsymb_initial);
-  cpyToDuHarq(O_RI);
-  cpyToDuHarq(Or1);
-  cpyToDuHarq(first_rb);
-  cpyToDuHarq(V_UL_DAI);
-  cpyToDuHarq(Qm);
-  cpyToDuHarq(srs_active);
-  cpyToDuHarq(TBS);
-  cpyToDuHarq(Nsymb_pusch);
-  memcpyToDuHarq(dci_alloc);
-  memcpyToDuHarq(rar_alloc);
-  memcpyToDuHarq(status);
-  memcpyToDuHarq(Msg3_flag);
-  memcpyToDuHarq(phich_active);
-  memcpyToDuHarq(phich_ACK);
-  memcpyToDuHarq(previous_first_rb);
-  memcpyToDuHarq(B);
-  memcpyToDuHarq(G);
-  //memcpyToDuHarq(o);
-  memcpyToDuHarq(uci_format);
-  memcpyToDuHarq(Or2);
-  memcpyToDuHarq(o_RI);
-  memcpyToDuHarq(o_ACK);
-  memcpyToDuHarq(O_ACK);
-  //memcpyToDuHarq(q);
-  memcpyToDuHarq(o_RCC);
-  memcpyToDuHarq(q_ACK);
-  memcpyToDuHarq(q_RI);
-  memcpyToDuHarq(RTC);
-  memcpyToDuHarq(ndi);
-  memcpyToDuHarq(round);
-  memcpyToDuHarq(rvidx);
-  memcpyToDuHarq(Nl);
-  memcpyToDuHarq(n_DMRS);
-  memcpyToDuHarq(previous_n_DMRS);
-  memcpyToDuHarq(n_DMRS2);
-  memcpyToDuHarq(delta_TF);
-  memcpyToDuHarq(repetition_number );
-  memcpyToDuHarq(total_number_of_repetitions);
-  LOG_D(PHY,"Added request to perform ulsch for: rnti:%x, fsf: %d/%d\n", ulsch->rnti, frame, subframe);
-}
-
-void appendFs6DLUE(uint8_t *bufferZone, LTE_DL_FRAME_PARMS *fp, int UE_id, int8_t harq_pid, LTE_eNB_DLSCH_t *dlsch0, LTE_DL_eNB_HARQ_t *harqData, int frame, int subframe) {
-  commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
-  // move to the end
-  uint8_t *firstFreeByte=bufferZone;
-  int curBlock=0;
-
-  for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
-    AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
-    firstFreeByte+=alignedSize(firstFreeByte);
-    curBlock++;
-  }
-
-  int UEdataLen= get_G(fp,
-                       harqData->nb_rb,
-                       harqData->rb_alloc,
-                       harqData->Qm,
-                       harqData->Nl,
-                       harqData->pdsch_start,
-                       frame,subframe,
-                       0);
-  AssertFatal(firstFreeByte+ceil16_bytes(UEdataLen)+sizeof(fs6_dl_t) <= bufferZone+FS6_BUF_SIZE, "");
-  commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
-  FirstUDPheader->nbBlocks++;
-  newUDPheader->blockID=curBlock;
-  newUDPheader->contentBytes=sizeof(fs6_dl_t)+sizeof(fs6_dl_uespec_t) + ceil16_bytes(UEdataLen);
-  // We skip the fs6 DL header, that is populated by caller
-  // This header will be duplicated during sending
-  hDLUE(newUDPheader)->type=fs6DlConfig;
-  hDLUE(newUDPheader)->UE_id=UE_id;
-  hDLUE(newUDPheader)->harq_pid=harq_pid;
-  hDLUE(newUDPheader)->rnti=dlsch0->rnti;
-  hDLUE(newUDPheader)->sqrt_rho_a=dlsch0->sqrt_rho_a;
-  hDLUE(newUDPheader)->sqrt_rho_b=dlsch0->sqrt_rho_b;
-  hDLUE(newUDPheader)->nb_rb=harqData->nb_rb;
-  memcpy(hDLUE(newUDPheader)->rb_alloc, harqData->rb_alloc, sizeof(harqData->rb_alloc));
-  hDLUE(newUDPheader)->Qm=harqData->Qm;
-  hDLUE(newUDPheader)->Nl=harqData->Nl;
-  hDLUE(newUDPheader)->pdsch_start=harqData->pdsch_start;
-#ifdef PHY_TX_THREAD
-  hDLUE(newUDPheader)->CEmode=harqData->CEmode;
-  hDLUE(newUDPheader)->i0=harqData->i0;
-  hDLUE(newUDPheader)->sib1_br_flag=harqData->sib1_br_flag;
-#else
-  hDLUE(newUDPheader)->i0=dlsch0->i0;
-  hDLUE(newUDPheader)->sib1_br_flag=dlsch0->sib1_br_flag;
-#endif
-  hDLUE(newUDPheader)->dataLen=UEdataLen;
-  fs6Dlpack(hDLUE(newUDPheader)+1, harqData->eDL, UEdataLen);
-  LOG_D(PHY,"sending %d bits, in harq id: %di fsf: %d.%d, sum %d\n",
-        UEdataLen, harq_pid, frame, subframe, sum(harqData->eDL, UEdataLen));
-  //for (int i=0; i < UEdataLen; i++)
-  //LOG_D(PHY,"buffer ei[%d]:%hhx\n", i, ( (uint8_t *)(hDLUE(newUDPheader)+1) )[i]);
-}
-
-void appendFs6DLUEcch(uint8_t *bufferZone, PHY_VARS_eNB *eNB, int frame, int subframe) {
-  commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
-  // move to the end
-  uint8_t *firstFreeByte=bufferZone;
-  int curBlock=0;
-
-  for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
-    AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
-    firstFreeByte+=alignedSize(firstFreeByte);
-    curBlock++;
-  }
-
-  commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
-  bool first_UE=true;
-
-  for (int i = 0; i < NUMBER_OF_UCI_MAX; i++) {
-    LTE_eNB_UCI *uci = &(eNB->uci_vars[i]);
-
-    if ((uci->active == 1) && (uci->frame == frame) && (uci->subframe == subframe)) {
-      LOG_D(PHY,"Frame %d, subframe %d: adding uci procedures (type %d) for %d \n",
-            frame,
-            subframe,
-            uci->type,
-            i);
-
-      if ( first_UE ) {
-        FirstUDPheader->nbBlocks++;
-        newUDPheader->blockID=curBlock;
-        newUDPheader->contentBytes=sizeof(fs6_dl_t)+sizeof(fs6_dl_uespec_ulcch_t);
-        hTxULcch(newUDPheader)->type=fs6ULConfigCCH;
-        hTxULcch(newUDPheader)->nb_active_ue=0;
-        first_UE=false;
-      }
-
-      fs6_dl_uespec_ulcch_element_t *tmp=(fs6_dl_uespec_ulcch_element_t *)(hTxULcch(newUDPheader)+1);
-      tmp+=hTxULcch(newUDPheader)->nb_active_ue;
-      tmp->UE_id=i;
-      memcpy(&tmp->cch_vars,uci, sizeof(tmp->cch_vars));
-      hTxULcch(newUDPheader)->nb_active_ue++;
-      newUDPheader->contentBytes+=sizeof(fs6_dl_uespec_ulcch_element_t);
-    }
-  }
-}
-
-void phy_procedures_eNB_TX_tosplit(uint8_t *bufferZone, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, int do_meas, uint8_t *buf, int bufSize) {
-  int frame=proc->frame_tx;
-  int subframe=proc->subframe_tx;
-  LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
-
-  if ((fp->frame_type == TDD) && (subframe_select (fp, subframe) == SF_UL)) {
-    LOG_W(HW,"no sending in eNB_TX\n");
-    return;
-  }
-
-  // clear previous allocation information for all UEs
-  for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
-    //if (eNB->dlsch[i][0])
-    //eNB->dlsch[i][0]->subframe_tx[subframe] = 0;
-  }
-
-  // Send to DU the UL scheduled for future UL subframe
-  for (int i=0; i<NUMBER_OF_UE_MAX; i++) {
-    int harq_pid;
-    LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[i];
-    if (ulsch == NULL)
-      continue;
-
-    if (ulsch->ue_type > NOCE)
-      harq_pid = 0;
-    else
-      harq_pid= subframe2harq_pid(&eNB->frame_parms,frame,subframe);
-
-    LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
-
-    if (ulsch->rnti>0) {
-      LOG_D(PHY,"check in UL scheduled harq %d: rnti %d, tx frame %d/%d, ulsch: %d, %d/%d (handled: %d)\n",
-            harq_pid, ulsch->rnti, frame, subframe, ulsch_harq->status, ulsch_harq->frame, ulsch_harq->subframe, ulsch_harq->handled);
-    }
-
-    for (int k=0; k<8; k++) {
-      ulsch_harq = ulsch->harq_processes[k];
-      if (ulsch_harq == NULL)
-        continue;
-
-      if ((ulsch->rnti>0) &&
-          (ulsch_harq->status == ACTIVE) &&
-          (ulsch_harq->frame == frame) &&
-          (ulsch_harq->subframe == subframe) &&
-          (ulsch_harq->handled == 0)
-         )
-        appendFs6TxULUE(bufferZone,
-                        fp,
-                        i,
-                        ulsch,
-                        frame,
-                        subframe
-                       );
-    }
-  }
-
-  appendFs6DLUEcch(bufferZone,
-                   eNB,
-                   frame,
-                   subframe
-                  );
-  uint8_t num_pdcch_symbols = eNB->pdcch_vars[subframe&1].num_pdcch_symbols;
-  uint8_t num_dci           = eNB->pdcch_vars[subframe&1].num_dci;
-  uint8_t num_mdci          = eNB->mpdcch_vars[subframe&1].num_dci;
-  memcpy(hDL(bufferZone)->pbch_pdu,eNB->pbch_pdu,4);
-
-  if ( num_dci <= 8 )
-    LOG_D(PHY,"num_pdcch_symbols %"PRIu8",number dci %"PRIu8"\n",num_pdcch_symbols, num_dci);
-  else {
-    LOG_E(PHY, "Num dci too large for current FS6 implementation, reducing to 8 dci (was %d)\n",  num_dci);
-    num_dci=8;
-  }
-
-  if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
-    hDL(bufferZone)->num_pdcch_symbols=num_pdcch_symbols;
-    hDL(bufferZone)->num_dci=num_dci;
-    hDL(bufferZone)->num_mdci=num_mdci;
-    hDL(bufferZone)->amp=AMP;
-
-    for (int i=0; i< hDL(bufferZone)->num_dci; i++)
-      hDL(bufferZone)->dci_alloc[i]=eNB->pdcch_vars[subframe&1].dci_alloc[i];
-
-    LOG_D(PHY, "pbch configured: %d\n", eNB->pbch_configured);
-  }
-
-  if (do_meas==1) stop_meas(&eNB->dlsch_common_and_dci);
-
-  if (do_meas==1) start_meas(&eNB->dlsch_ue_specific);
-
-  for (int UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
-    LTE_eNB_DLSCH_t *dlsch0 = eNB->dlsch[UE_id][0];
-
-    if ((dlsch0)&&(dlsch0->rnti>0)&&
-#ifdef PHY_TX_THREAD
-        (dlsch0->active[subframe] == 1)
-#else
-        (dlsch0->active == 1)
-#endif
-       ) {
-      // get harq_pid
-      int harq_pid = dlsch0->harq_ids[frame%2][subframe];
-      AssertFatal(harq_pid>=0,"harq_pid is negative\n");
-
-      if (harq_pid>=8) {
-        if (dlsch0->ue_type == NOCE)
-          LOG_E(PHY,"harq_pid:%d corrupt must be 0-7 UE_id:%d frame:%d subframe:%d rnti:%x [ %1d.%1d.%1d.%1d.%1d.%1d.%1d.%1d\n", harq_pid,UE_id,frame,subframe,dlsch0->rnti,
-                dlsch0->harq_ids[frame%2][0],
-                dlsch0->harq_ids[frame%2][1],
-                dlsch0->harq_ids[frame%2][2],
-                dlsch0->harq_ids[frame%2][3],
-                dlsch0->harq_ids[frame%2][4],
-                dlsch0->harq_ids[frame%2][5],
-                dlsch0->harq_ids[frame%2][6],
-                dlsch0->harq_ids[frame%2][7]);
-      } else {
-        if (dlsch_procedures(eNB,
-                             proc,
-                             harq_pid,
-                             dlsch0,
-                             &eNB->UE_stats[(uint32_t)UE_id])) {
-          // data in: dlsch0 harq_processes[harq_pid]->e
-          /* length
-             get_G(fp,
-             dlsch_harq->nb_rb,
-             dlsch_harq->rb_alloc,
-             dlsch_harq->Qm,
-             dlsch_harq->Nl,
-             dlsch_harq->pdsch_start,
-             frame,subframe,
-             0)
-             need harq_pid
-          */
-          LTE_DL_eNB_HARQ_t *dlsch_harq=dlsch0->harq_processes[harq_pid];
-          appendFs6DLUE(bufferZone,
-                        fp,
-                        UE_id,
-                        harq_pid,
-                        dlsch0,
-                        dlsch_harq,
-                        frame,
-                        subframe
-                       );
-        }
-      }
-    } else if ((dlsch0)&&(dlsch0->rnti>0)&&
-#ifdef PHY_TX_THREAD
-               (dlsch0->active[subframe] == 0)
-#else
-               (dlsch0->active == 0)
-#endif
-              ) {
-      // clear subframe TX flag since UE is not scheduled for PDSCH in this subframe (so that we don't look for PUCCH later)
-      //dlsch0->subframe_tx[subframe]=0;
-    }
-  }
-
-  hDL(bufferZone)->phich_vars=eNB->phich_vars[subframe&1];
-
-  if (do_meas==1) stop_meas(&eNB->dlsch_ue_specific);
-
-  if (do_meas==1) stop_meas(&eNB->phy_proc_tx);
-
-  // MBMS is not working in OAI
-  if (hDL(bufferZone)->num_mdci) abort();
-
-  return;
-}
-
-void *DL_du_fs6(void *arg) {
-  RU_t *ru=(RU_t *)arg;
-  static uint64_t lastTS;
-  L1_rxtx_proc_t L1proc= {0};
-  // We pick the global thread pool from the legacy code global vars
-  L1proc.threadPool=RC.eNB[0][0]->proc.L1_proc.threadPool;
-  L1proc.respEncode=RC.eNB[0][0]->proc.L1_proc.respEncode;
-  L1proc.respDecode=RC.eNB[0][0]->proc.L1_proc.respDecode;
-  initStaticTime(begingWait);
-  initStaticTime(begingProcessing);
-  initRefTimes(fullLoop);
-  initRefTimes(DuHigh);
-  initRefTimes(DuLow);
-  initRefTimes(transportTime);
-
-  while (1) {
-    for (int i=0; i<ru->num_eNB; i++) {
-      initBufferZone(bufferZone);
-      pickStaticTime(begingWait);
-      int nb_blocks=receiveSubFrame(&sockFS6, bufferZone, sizeof(bufferZone), CTsentCUv0 );
-      updateTimesReset(begingWait, &fullLoop, 1000, false, "DU wait CU");
-
-      if (nb_blocks > 0) {
-        if ( lastTS+ru->eNB_list[i]->frame_parms.samples_per_tti < hUDP(bufferZone)->timestamp) {
-          LOG_E(HW,"Missed a subframe: expecting: %lu, received %lu\n",
-                lastTS+ru->eNB_list[i]->frame_parms.samples_per_tti,
-                hUDP(bufferZone)->timestamp);
-        } else if ( lastTS+ru->eNB_list[i]->frame_parms.samples_per_tti > hUDP(bufferZone)->timestamp) {
-          LOG_E(HW,"Received a subframe in past time from CU (dropping it): expecting: %lu, received %lu\n",
-                lastTS+ru->eNB_list[i]->frame_parms.samples_per_tti,
-                hUDP(bufferZone)->timestamp);
-        }
-
-        pickStaticTime(begingProcessing);
-        lastTS=hUDP(bufferZone)->timestamp;
-        setAllfromTS(hUDP(bufferZone)->timestamp - sf_ahead*ru->eNB_list[i]->frame_parms.samples_per_tti, &L1proc);
-        measTransportTime(hDL(bufferZone)->DuClock, hDL(bufferZone)->CuSpentMicroSec,
-                          &transportTime, 1000, false, "Transport time, to CU + from CU for one subframe");
-        phy_procedures_eNB_TX_fromsplit( bufferZone, nb_blocks, ru->eNB_list[i], &L1proc, 1);
-        updateTimesReset(begingProcessing, &DuHigh, 1000, false, "DU high layer1 processing for DL");
-      } else
-        LOG_E(PHY,"DL not received for subframe\n");
-    }
-
-    pickStaticTime(begingProcessing);
-    feptx_prec(ru, L1proc.frame_tx,L1proc.subframe_tx );
-    feptx_ofdm(ru, L1proc.frame_tx,L1proc.subframe_tx );
-    ocp_tx_rf(ru, &L1proc);
-    updateTimesReset(begingProcessing, &DuLow, 1000, false, "DU low layer1 processing for DL");
-
-    if ( IS_SOFTMODEM_RFSIM )
-      return NULL;
-  }
-
-  return NULL;
-}
-
-void UL_du_fs6(RU_t *ru, L1_rxtx_proc_t *proc) {
-  initStaticTime(begingWait);
-  initRefTimes(fullLoop);
-  pickStaticTime(begingWait);
-  rx_rf(ru, proc);
-  updateTimesReset(begingWait, &fullLoop, 1000, false, "DU wait USRP");
-  // front end processing: convert from time domain to frequency domain
-  // fills rxdataF buffer
-  fep_full(ru, proc->subframe_rx);
-  // Fixme: datamodel issue
-  PHY_VARS_eNB *eNB = RC.eNB[0][0];
-
-  if (NFAPI_MODE==NFAPI_MODE_PNF) {
-    // I am a PNF and I need to let nFAPI know that we have a (sub)frame tick
-    //add_subframe(&frame, &subframe, 4);
-    //oai_subframe_ind(proc->frame_tx, proc->subframe_tx);
-    oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
-  }
-
-  initBufferZone(bufferZone);
-  hUDP(bufferZone)->timestamp=proc->timestamp_rx;
-  prach_eNB_tosplit(bufferZone, FS6_BUF_SIZE, eNB, proc );
-
-  if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
-    phy_procedures_eNB_uespec_RX_tosplit(bufferZone, FS6_BUF_SIZE, eNB, proc );
-  }
-
-  if (hUDP(bufferZone)->nbBlocks==0) {
-    hUDP(bufferZone)->nbBlocks=1; // We have to send the signaling, even is there is no user plan data (no UE)
-    hUDP(bufferZone)->blockID=0;
-    hUDP(bufferZone)->contentBytes=sizeof(fs6_ul_t);
-  }
-
-  for (int i=0; i<ru->num_eNB; i++) {
-    sendSubFrame(&sockFS6, bufferZone, sizeof(fs6_ul_t), CTsentDUv0);
-  }
-}
-
-void DL_cu_fs6(RU_t *ru, L1_rxtx_proc_t *proc, uint64_t  DuClock, uint64_t startCycle) {
-  initRefTimes(CUprocessing);
-  // Fixme: datamodel issue
-  PHY_VARS_eNB *eNB = RC.eNB[0][0];
-  pthread_mutex_lock(&eNB->UL_INFO_mutex);
-  eNB->UL_INFO.frame     = proc->frame_rx;
-  eNB->UL_INFO.subframe  = proc->subframe_rx;
-  eNB->UL_INFO.module_id = eNB->Mod_id;
-  eNB->UL_INFO.CC_id     = eNB->CC_id;
-  eNB->if_inst->UL_indication(&eNB->UL_INFO, proc);
-  pthread_mutex_unlock(&eNB->UL_INFO_mutex);
-  initBufferZone(bufferZone);
-  phy_procedures_eNB_TX_tosplit(bufferZone, eNB, proc, 1, bufferZone, FS6_BUF_SIZE);
-  hUDP(bufferZone)->timestamp=proc->timestamp_tx;
-
-  if (hUDP(bufferZone)->nbBlocks==0) {
-    hUDP(bufferZone)->nbBlocks=1; // We have to send the signaling, even is there is no user plan data (no UE)
-    hUDP(bufferZone)->blockID=0;
-    hUDP(bufferZone)->contentBytes=sizeof(fs6_dl_t);
-  }
-
-  hDL(bufferZone)->DuClock=DuClock;
-  hDL(bufferZone)->CuSpentMicroSec=(rdtsc_oai()-startCycle)/(cpuf*1000);
-  updateTimesReset(startCycle, &CUprocessing, 1000,  true,"CU entire processing from recv to send");
-  sendSubFrame(&sockFS6, bufferZone, sizeof(fs6_dl_t), CTsentCUv0 );
-  return;
-}
-
-void UL_cu_fs6(RU_t *ru, L1_rxtx_proc_t *proc, uint64_t *TS, uint64_t *DuClock, uint64_t *startProcessing) {
-  initBufferZone(bufferZone);
-  initStaticTime(begingWait);
-  initRefTimes(fullLoop);
-  pickStaticTime(begingWait);
-  int nb_blocks=receiveSubFrame(&sockFS6, bufferZone, sizeof(bufferZone), CTsentDUv0 );
-  * DuClock=hUDP(bufferZone)->senderClock;
-  * startProcessing=rdtsc_oai();
-  updateTimesReset(begingWait, &fullLoop, 1000, false, "CU wait DU");
-
-  if (nb_blocks ==0) {
-    LOG_W(PHY, "CU lost a subframe\n");
-    return;
-  }
-
-  if (nb_blocks != hUDP(bufferZone)->nbBlocks )
-    LOG_W(PHY, "received %d blocks for %d expected\n", nb_blocks, hUDP(bufferZone)->nbBlocks);
-
-  if ( *TS != hUDP(bufferZone)->timestamp ) {
-    LOG_W(HW, "CU received time: %lu instead of %lu expected\n", hUDP(bufferZone)->timestamp, *TS);
-    *TS=hUDP(bufferZone)->timestamp;
-  }
-
-  setAllfromTS(hUDP(bufferZone)->timestamp, proc);
-  PHY_VARS_eNB *eNB = RC.eNB[0][0];
-
-  if (is_prach_subframe(&eNB->frame_parms, proc->frame_prach,proc->subframe_prach)>0)
-    prach_eNB_fromsplit(bufferZone, sizeof(bufferZone), eNB, proc);
-
-  release_UE_in_freeList(eNB->Mod_id);
-
-  if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
-    phy_procedures_eNB_uespec_RX_fromsplit(bufferZone, nb_blocks, eNB, proc);
-  }
-}
-
-void *cu_fs6(void *arg) {
-  setbuf(stdout, NULL);
-  setbuf(stderr, NULL);
-  RU_t               *ru      = (RU_t *)arg;
-  //RU_proc_t          *proc    = &ru->proc;
-  fill_rf_config(ru,ru->rf_config_file);
-  init_frame_parms(ru->frame_parms,1);
-  phy_init_RU(ru);
-  wait_sync("ru_thread");
-  char remoteIP[1024];
-  strncpy(remoteIP,get_softmodem_params()->split73+3, 1023); //three first char should be cu: or du:
-  char port_def[256]=DU_PORT;
-
-  for (int i=0; i <1000; i++)
-    if (remoteIP[i]==':') {
-      strncpy(port_def,remoteIP+i+1,255);
-      remoteIP[i]=0;
-      break;
-    }
-
-  AssertFatal(createUDPsock(NULL, CU_PORT, remoteIP, port_def, &sockFS6), "");
-  L1_rxtx_proc_t L1proc= {0};
-  // We pick the global thread pool from the legacy code global vars
-  L1proc.threadPool=RC.eNB[0][0]->proc.L1_proc.threadPool;
-  L1proc.respEncode=RC.eNB[0][0]->proc.L1_proc.respEncode;
-  L1proc.respDecode=RC.eNB[0][0]->proc.L1_proc.respDecode;
-  uint64_t timeStamp=0;
-  initStaticTime(begingWait);
-  initStaticTime(begingWait2);
-  initRefTimes(waitDUAndProcessingUL);
-  initRefTimes(makeSendDL);
-  initRefTimes(fullLoop);
-  uint64_t DuClock=0, startProcessing=0;
-
-  while(1) {
-    timeStamp+=ru->frame_parms->samples_per_tti;
-    updateTimesReset(begingWait, &fullLoop, 1000, true, "CU for full SubFrame (must be less 1ms)");
-    pickStaticTime(begingWait);
-    UL_cu_fs6(ru, &L1proc, &timeStamp, &DuClock, &startProcessing);
-    updateTimesReset(begingWait, &waitDUAndProcessingUL, 1000,  true,"CU Time in wait Rx + Ul processing");
-    pickStaticTime(begingWait2);
-    DL_cu_fs6(ru, &L1proc, DuClock, startProcessing);
-    updateTimesReset(begingWait2, &makeSendDL, 1000,  true,"CU Time in DL build+send");
-  }
-
-  return NULL;
-}
-
-void *du_fs6(void *arg) {
-  setbuf(stdout, NULL);
-  setbuf(stderr, NULL);
-  RU_t               *ru      = (RU_t *)arg;
-  //RU_proc_t          *proc    = &ru->proc;
-  fill_rf_config(ru,ru->rf_config_file);
-  init_frame_parms(ru->frame_parms,1);
-  phy_init_RU(ru);
-  init_rf(ru);
-  wait_sync("ru_thread");
-  char remoteIP[1024];
-  strncpy(remoteIP,get_softmodem_params()->split73+3,1023); //three first char should be cu: or du:
-  char port_def[256]=CU_PORT;
-
-  for (int i=0; i <1000; i++)
-    if (remoteIP[i]==':') {
-      strncpy(port_def,remoteIP+i+1,255);
-      remoteIP[i]=0;
-      break;
-    }
-
-  AssertFatal(createUDPsock(NULL, DU_PORT, remoteIP, port_def, &sockFS6), "");
-
-  if (ru->rfdevice.trx_start_func(&ru->rfdevice) != 0)
-    LOG_E(HW,"Could not start the RF device\n");
-  else
-    LOG_I(PHY,"RU %d rf device ready\n",ru->idx);
-
-  initStaticTime(begingWait);
-  initRefTimes(waitRxAndProcessingUL);
-  initRefTimes(fullLoop);
-  pthread_t t;
-
-  if ( !IS_SOFTMODEM_RFSIM )
-    threadCreate(&t, DL_du_fs6, (void *)ru, "MainDuTx", -1, OAI_PRIORITY_RT_MAX);
-
-  L1_rxtx_proc_t L1proc= {0};
-  // We pick the global thread pool from the legacy code global vars
-  L1proc.threadPool=RC.eNB[0][0]->proc.L1_proc.threadPool;
-  L1proc.respEncode=RC.eNB[0][0]->proc.L1_proc.respEncode;
-  L1proc.respDecode=RC.eNB[0][0]->proc.L1_proc.respDecode;
-
-  while(!oai_exit) {
-    updateTimesReset(begingWait, &fullLoop, 1000,  true,"DU for full SubFrame (must be less 1ms)");
-    pickStaticTime(begingWait);
-    UL_du_fs6(ru, &L1proc);
-
-    if ( IS_SOFTMODEM_RFSIM )
-      DL_du_fs6((void *)ru);
-
-    updateTimesReset(begingWait, &waitRxAndProcessingUL, 1000,  true,"DU Time in wait Rx + Ul processing");
-  }
-
-  ru->rfdevice.trx_end_func(&ru->rfdevice);
-  LOG_I(PHY,"RU %d rf device stopped\n",ru->idx);
-  return NULL;
-}
diff --git a/executables/main-ocp.c b/executables/main-ocp.c
deleted file mode 100644
index 380690e945..0000000000
--- a/executables/main-ocp.c
+++ /dev/null
@@ -1,1291 +0,0 @@
-/*
-* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The OpenAirInterface Software Alliance licenses this file to You under
-* the OAI Public License, Version 1.1  (the "License"); you may not use this file
-* except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.openairinterface.org/?page_id=698
-*
-* Author and copyright: Laurent Thomas, open-cells.com
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*-------------------------------------------------------------------------------
-* For more information about the OpenAirInterface (OAI) Software Alliance:
-*      contact@openairinterface.org
-*/
-
-
-/*
- * This file replaces
- * executables/lte-softmodem.c
- * executables/rt_wrapper.c
- * executables/lte-ru.c
- * executables/lte-enb.c
- * executables/ru_control.c
- * openair1/SCHED/prach_procedures.c
- * The merger of OpenAir central code to this branch
- * should check if these 3 files are modified and analyze if code code has to be copied in here
- */
-#define  _GNU_SOURCE
-#include <pthread.h>
-
-#include <common/utils/LOG/log.h>
-#include <common/utils/system.h>
-#include <common/utils/assertions.h>
-static int DEFBANDS[] = {7};
-static int DEFENBS[] = {0};
-#include <common/config/config_userapi.h>
-#include "executables/lte-softmodem.h"
-#include <openair1/PHY/defs_eNB.h>
-#include <openair1/PHY/phy_extern.h>
-#include <nfapi/oai_integration/vendor_ext.h>
-#include <openair1/SCHED/fapi_l1.h>
-#include <openair1/PHY/INIT/phy_init.h>
-#include <openair2/LAYER2/MAC/mac_extern.h>
-#include <openair1/PHY/LTE_REFSIG/lte_refsig.h>
-#include <nfapi/oai_integration/nfapi_pnf.h>
-#include <executables/split_headers.h>
-#include <common/utils/threadPool/thread-pool.h>
-#include <openair2/ENB_APP/NB_IoT_interface.h>
-#include <common/utils/load_module_shlib.h>
-#include <targets/COMMON/create_tasks.h>
-#include <openair1/PHY/TOOLS/phy_scope_interface.h>
-#include <openair2/UTIL/OPT/opt.h>
-#include <openair1/SIMULATION/TOOLS/sim.h>
-#include <openair1/PHY/phy_vars.h>
-#include <openair2/LAYER2/MAC/mac_vars.h>
-#include <openair2/RRC/LTE/rrc_vars.h>
-
-pthread_cond_t nfapi_sync_cond;
-pthread_mutex_t nfapi_sync_mutex;
-int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex
-pthread_cond_t sync_cond;
-pthread_mutex_t sync_mutex;
-int sync_var=-1; //!< protected by mutex \ref sync_mutex.
-int config_sync_var=-1;
-int oai_exit = 0;
-double cpuf;
-THREAD_STRUCT thread_struct;
-
-extern uint16_t sf_ahead; // Bell Labs
-//uint16_t sf_ahead=4;
-//uint16_t slot_ahead=6;
-int otg_enabled;
-uint64_t  downlink_frequency[MAX_NUM_CCs][4];
-int32_t   uplink_frequency_offset[MAX_NUM_CCs][4];
-int split73;
-char *split73_config;
-int split73;
-AGENT_RRC_xface *agent_rrc_xface[NUM_MAX_ENB]= {0};
-AGENT_MAC_xface *agent_mac_xface[NUM_MAX_ENB]= {0};
-
-static void *ru_thread( void *param );
-void kill_RU_proc(RU_t *ru) {
-}
-void kill_eNB_proc(int inst) {
-}
-void free_transport(PHY_VARS_eNB *eNB) {
-}
-void reset_opp_meas(void) {
-}
-extern void  phy_free_RU(RU_t *);
-
-void exit_function(const char *file, const char *function, const int line, const char *s) {
-  if (s != NULL) {
-    printf("%s:%d %s() Exiting OAI softmodem: %s\n",file,line, function, s);
-  }
-
-  close_log_mem();
-  oai_exit = 1;
-  if (assert) {
-    abort();
-  } else {
-    sleep(1); // allow lte-softmodem threads to exit first
-    exit(EXIT_SUCCESS);
-  }
-}
-
-// Fixme: there are many mistakes in the datamodel and in redondant variables
-// TDD is also mode complex
-void setAllfromTS(uint64_t TS, L1_rxtx_proc_t *proc) {
-  for (int i=0; i < RC.nb_inst; i++) {
-    for (int j=0; j<RC.nb_CC[i]; j++) {
-      LTE_DL_FRAME_PARMS *fp=&RC.eNB[i][j]->frame_parms;
-      uint64_t TStx=TS+(sf_ahead)*fp->samples_per_tti;
-      uint64_t TSrach=TS;//-fp->samples_per_tti;
-      proc->timestamp_rx=  TS;
-      proc->timestamp_tx=  TStx;
-      proc->subframe_rx=   (TS    / fp->samples_per_tti)%10;
-      proc->subframe_prach=(TSrach    / fp->samples_per_tti)%10;
-      proc->subframe_prach_br=(TSrach / fp->samples_per_tti)%10;
-      proc->frame_rx=      (TS    / (fp->samples_per_tti*10))&1023;
-      proc->frame_prach=   (TSrach    / (fp->samples_per_tti*10))&1023;
-      proc->frame_prach_br=(TSrach    / (fp->samples_per_tti*10))&1023;
-      proc->frame_tx=      (TStx  / (fp->samples_per_tti*10))&1023;
-      proc->subframe_tx=  (TStx  / fp->samples_per_tti)%10;
-    }
-  }
-
-  return;
-}
-
-void init_RU_proc(RU_t *ru) {
-  pthread_t t;
-
-  switch(split73) {
-    case SPLIT73_CU:
-      threadCreate(&t, cu_fs6, (void *)ru, "MainCu", -1, OAI_PRIORITY_RT_MAX);
-      break;
-
-    case SPLIT73_DU:
-      threadCreate(&t, du_fs6, (void *)ru, "MainDuRx", -1, OAI_PRIORITY_RT_MAX);
-      break;
-
-    default:
-      threadCreate(&t,  ru_thread, (void *)ru, "MainRu", -1, OAI_PRIORITY_RT_MAX);
-  }
-}
-
-// Create per UE structures
-void init_transport(PHY_VARS_eNB *eNB) {
-  LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
-  LOG_I(PHY, "Initialise transport\n");
-
-  for (int i=0; i<NUMBER_OF_DLSCH_MAX; i++) {
-    LOG_D(PHY,"Allocating Transport Channel Buffers for DLSCH, UE %d\n",i);
-
-    for (int j=0; j<2; j++) {
-      AssertFatal( (eNB->dlsch[i][j] = new_eNB_dlsch(1,8,NSOFT,fp->N_RB_DL,0,fp)) != NULL,
-                   "Can't get eNB dlsch structures for UE %d \n", i);
-      eNB->dlsch[i][j]->rnti=0;
-      LOG_D(PHY,"dlsch[%d][%d] => %p rnti:%d\n",i,j,eNB->dlsch[i][j], eNB->dlsch[i][j]->rnti);
-    }
-  }
-
-  for (int i=0; i<NUMBER_OF_ULSCH_MAX; i++) {
-    LOG_D(PHY,"Allocating Transport Channel Buffers for ULSCH, UE %d\n",i);
-    AssertFatal((eNB->ulsch[1+i] = new_eNB_ulsch(MAX_TURBO_ITERATIONS,fp->N_RB_UL, 0)) != NULL,
-                "Can't get eNB ulsch structures\n");
-    // this is the transmission mode for the signalling channels
-    // this will be overwritten with the real transmission mode by the RRC once the UE is connected
-    eNB->transmission_mode[i] = fp->nb_antenna_ports_eNB==1 ? 1 : 2;
-  }
-
-  // ULSCH for RA
-  AssertFatal( (eNB->ulsch[0] = new_eNB_ulsch(MAX_TURBO_ITERATIONS, fp->N_RB_UL, 0)) !=NULL,
-               "Can't get eNB ulsch structures\n");
-  eNB->dlsch_SI  = new_eNB_dlsch(1,8,NSOFT,fp->N_RB_DL, 0, fp);
-  LOG_D(PHY,"eNB %d.%d : SI %p\n",eNB->Mod_id,eNB->CC_id,eNB->dlsch_SI);
-  eNB->dlsch_ra  = new_eNB_dlsch(1,8,NSOFT,fp->N_RB_DL, 0, fp);
-  LOG_D(PHY,"eNB %d.%d : RA %p\n",eNB->Mod_id,eNB->CC_id,eNB->dlsch_ra);
-  eNB->dlsch_MCH = new_eNB_dlsch(1,8,NSOFT,fp->N_RB_DL, 0, fp);
-  LOG_D(PHY,"eNB %d.%d : MCH %p\n",eNB->Mod_id,eNB->CC_id,eNB->dlsch_MCH);
-  eNB->rx_total_gain_dB=130;
-
-  for(int i=0; i<NUMBER_OF_UE_MAX; i++)
-    eNB->mu_mimo_mode[i].dl_pow_off = 2;
-
-  eNB->check_for_total_transmissions = 0;
-  eNB->check_for_MUMIMO_transmissions = 0;
-  eNB->FULL_MUMIMO_transmissions = 0;
-  eNB->check_for_SUMIMO_transmissions = 0;
-  fp->pucch_config_common.deltaPUCCH_Shift = 1;
-
-  if (eNB->use_DTX == 0)
-    fill_subframe_mask(eNB);
-}
-
-void init_eNB_afterRU(void) {
-  for (int inst=0; inst<RC.nb_inst; inst++) {
-    for (int CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) {
-      PHY_VARS_eNB *eNB = RC.eNB[inst][CC_id];
-      eNB->frame_parms.nb_antennas_rx       = 0;
-      eNB->frame_parms.nb_antennas_tx       = 0;
-      eNB->prach_vars.rxsigF[0] = (int16_t **)malloc16(64*sizeof(int16_t *));
-
-      for (int ce_level=0; ce_level<4; ce_level++) {
-        eNB->prach_vars_br.rxsigF[ce_level] = (int16_t **)malloc16(64*sizeof(int16_t *));
-      }
-
-      for (int ru_id=0,aa=0; ru_id<eNB->num_RU; ru_id++) {
-        eNB->frame_parms.nb_antennas_rx    += eNB->RU_list[ru_id]->nb_rx;
-        eNB->frame_parms.nb_antennas_tx    += eNB->RU_list[ru_id]->nb_tx;
-        AssertFatal(eNB->RU_list[ru_id]->common.rxdataF!=NULL,
-                    "RU %d : common.rxdataF is NULL\n",
-                    eNB->RU_list[ru_id]->idx);
-        AssertFatal(eNB->RU_list[ru_id]->prach_rxsigF!=NULL,
-                    "RU %d : prach_rxsigF is NULL\n",
-                    eNB->RU_list[ru_id]->idx);
-
-        for (int i=0; i<eNB->RU_list[ru_id]->nb_rx; aa++,i++) {
-          LOG_I(PHY,"Attaching RU %d antenna %d to eNB antenna %d\n",eNB->RU_list[ru_id]->idx,i,aa);
-          eNB->prach_vars.rxsigF[0][aa]    =  eNB->RU_list[ru_id]->prach_rxsigF[0][i];
-
-          for (int ce_level=0; ce_level<4; ce_level++)
-            eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[ru_id]->prach_rxsigF_br[ce_level][i];
-        }
-      }
-
-      AssertFatal( eNB->frame_parms.nb_antennas_rx > 0 && eNB->frame_parms.nb_antennas_rx < 5, "");
-      AssertFatal( eNB->frame_parms.nb_antennas_tx > 0 && eNB->frame_parms.nb_antennas_rx < 5, "");
-      phy_init_lte_eNB(eNB,0,0);
-
-      // need to copy rxdataF after L1 variables are allocated
-      for (int inst=0; inst<RC.nb_inst; inst++) {
-        for (int CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) {
-          PHY_VARS_eNB *eNB = RC.eNB[inst][CC_id];
-
-          for (int ru_id=0,aa=0; ru_id<eNB->num_RU; ru_id++) {
-            for (int i=0; i<eNB->RU_list[ru_id]->nb_rx; aa++,i++)
-              eNB->common_vars.rxdataF[aa]     =  eNB->RU_list[ru_id]->common.rxdataF[i];
-          }
-        }
-      }
-
-      LOG_I(PHY,"inst %d, CC_id %d : nb_antennas_rx %d\n",inst,CC_id,eNB->frame_parms.nb_antennas_rx);
-      init_transport(eNB);
-      //init_precoding_weights(RC.eNB[inst][CC_id]);
-    }
-  }
-}
-
-void init_eNB(int single_thread_flag,int wait_for_sync) {
-  AssertFatal(RC.eNB != NULL,"RC.eNB must have been allocated\n");
-
-  for (int inst=0; inst<RC.nb_L1_inst; inst++) {
-    AssertFatal(RC.eNB[inst] != NULL,"RC.eNB[%d] must have been allocated\n", inst);
-
-    for (int CC_id=0; CC_id<RC.nb_L1_CC[inst]; CC_id++) {
-      AssertFatal(RC.eNB[inst][CC_id] != NULL,"RC.eNB[%d][%d] must have been allocated\n", inst, CC_id);
-      PHY_VARS_eNB *eNB = RC.eNB[inst][CC_id];
-      eNB->abstraction_flag   = 0;
-      eNB->single_thread_flag = single_thread_flag;
-      AssertFatal((eNB->if_inst         = IF_Module_init(inst))!=NULL,"Cannot register interface");
-      eNB->if_inst->schedule_response   = schedule_response;
-      eNB->if_inst->PHY_config_req      = phy_config_request;
-      memset((void *)&eNB->UL_INFO,0,sizeof(eNB->UL_INFO));
-      memset((void *)&eNB->Sched_INFO,0,sizeof(eNB->Sched_INFO));
-      pthread_mutex_init( &eNB->UL_INFO_mutex, NULL);
-      LOG_I(PHY,"Setting indication lists\n");
-      eNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list   = eNB->rx_pdu_list;
-      eNB->UL_INFO.crc_ind.crc_indication_body.crc_pdu_list = eNB->crc_pdu_list;
-      eNB->UL_INFO.sr_ind.sr_indication_body.sr_pdu_list = eNB->sr_pdu_list;
-      eNB->UL_INFO.harq_ind.harq_indication_body.harq_pdu_list = eNB->harq_pdu_list;
-      eNB->UL_INFO.cqi_ind.cqi_indication_body.cqi_pdu_list = eNB->cqi_pdu_list;
-      eNB->UL_INFO.cqi_ind.cqi_indication_body.cqi_raw_pdu_list = eNB->cqi_raw_pdu_list;
-      eNB->prach_energy_counter = 0;
-    }
-  }
-
-  SET_LOG_DEBUG(PRACH);
-}
-
-void stop_eNB(int nb_inst) {
-  for (int inst=0; inst<nb_inst; inst++) {
-    LOG_I(PHY,"Killing eNB %d processing threads\n",inst);
-    kill_eNB_proc(inst);
-  }
-}
-
-// this is for RU with local RF unit
-void fill_rf_config(RU_t *ru, char *rf_config_file) {
-  int i;
-  LTE_DL_FRAME_PARMS *fp   = ru->frame_parms;
-  openair0_config_t *cfg   = &ru->openair0_cfg;
-  //printf("////////////////numerology in config = %d\n",numerology);
-  int numerology = 0; //get_softmodem_params()->numerology;
-
-  if(fp->N_RB_DL == 100) {
-    if(numerology == 0) {
-      if (fp->threequarter_fs) {
-        cfg->sample_rate=23.04e6;
-        cfg->samples_per_frame = 230400;
-        cfg->tx_bw = 10e6;
-        cfg->rx_bw = 10e6;
-      } else {
-        cfg->sample_rate=30.72e6;
-        cfg->samples_per_frame = 307200;
-        cfg->tx_bw = 10e6;
-        cfg->rx_bw = 10e6;
-      }
-    } else if(numerology == 1) {
-      cfg->sample_rate=61.44e6;
-      cfg->samples_per_frame = 307200;
-      cfg->tx_bw = 20e6;
-      cfg->rx_bw = 20e6;
-    } else if(numerology == 2) {
-      cfg->sample_rate=122.88e6;
-      cfg->samples_per_frame = 307200;
-      cfg->tx_bw = 40e6;
-      cfg->rx_bw = 40e6;
-    } else {
-      LOG_E(PHY,"Wrong input for numerology %d\n setting to 20MHz normal CP configuration",numerology);
-      cfg->sample_rate=30.72e6;
-      cfg->samples_per_frame = 307200;
-      cfg->tx_bw = 10e6;
-      cfg->rx_bw = 10e6;
-    }
-  } else if(fp->N_RB_DL == 50) {
-    cfg->sample_rate=15.36e6;
-    cfg->samples_per_frame = 153600;
-    cfg->tx_bw = 5e6;
-    cfg->rx_bw = 5e6;
-  } else if (fp->N_RB_DL == 25) {
-    cfg->sample_rate=7.68e6;
-    cfg->samples_per_frame = 76800;
-    cfg->tx_bw = 2.5e6;
-    cfg->rx_bw = 2.5e6;
-  } else if (fp->N_RB_DL == 6) {
-    cfg->sample_rate=1.92e6;
-    cfg->samples_per_frame = 19200;
-    cfg->tx_bw = 1.5e6;
-    cfg->rx_bw = 1.5e6;
-  } else
-    AssertFatal(1==0,"Unknown N_RB_DL %d\n",fp->N_RB_DL);
-
-  if (fp->frame_type==TDD)
-    cfg->duplex_mode = duplex_mode_TDD;
-  else //FDD
-    cfg->duplex_mode = duplex_mode_FDD;
-
-  cfg->Mod_id = 0;
-  cfg->num_rb_dl=fp->N_RB_DL;
-  cfg->tx_num_channels=ru->nb_tx;
-  cfg->rx_num_channels=ru->nb_rx;
-  cfg->clock_source=get_softmodem_params()->clock_source;
-
-  for (i=0; i<ru->nb_tx; i++) {
-    cfg->tx_freq[i] = (double)fp->dl_CarrierFreq;
-    cfg->rx_freq[i] = (double)fp->ul_CarrierFreq;
-    cfg->tx_gain[i] = (double)ru->att_tx;
-    cfg->rx_gain[i] = ru->max_rxgain-(double)ru->att_rx;
-    cfg->configFilename = rf_config_file;
-    LOG_I(PHY,"channel %d, Setting tx_gain offset %f, rx_gain offset %f, tx_freq %f, rx_freq %f\n",
-          i, cfg->tx_gain[i],
-          cfg->rx_gain[i],
-          cfg->tx_freq[i],
-          cfg->rx_freq[i]);
-  }
-}
-
-/* this function maps the RU tx and rx buffers to the available rf chains.
-   Each rf chain is is addressed by the card number and the chain on the card. The
-   rf_map specifies for each antenna port, on which rf chain the mapping should start. Multiple
-   antennas are mapped to successive RF chains on the same card. */
-int setup_RU_buffers(RU_t *ru) {
-  //uint16_t N_TA_offset = 0;
-  LTE_DL_FRAME_PARMS *frame_parms;
-  AssertFatal(ru, "ru is NULL");
-  frame_parms = ru->frame_parms;
-  LOG_I(PHY,"setup_RU_buffers: frame_parms = %p\n",frame_parms);
-
-  if (frame_parms->frame_type == TDD) {
-    if (frame_parms->N_RB_DL == 100) {
-      ru->N_TA_offset = 624;
-    } else if (frame_parms->N_RB_DL == 50) {
-      ru->N_TA_offset = 624/2;
-      ru->sf_extension       /= 2;
-      ru->end_of_burst_delay /= 2;
-    } else if (frame_parms->N_RB_DL == 25) {
-      ru->N_TA_offset = 624/4;
-      ru->sf_extension       /= 4;
-      ru->end_of_burst_delay /= 4;
-    } else {
-      LOG_E(PHY,"not handled, todo\n");
-      exit(1);
-    }
-  } else {
-    ru->N_TA_offset = 0;
-    ru->sf_extension = 0;
-    ru->end_of_burst_delay = 0;
-  }
-
-  return(0);
-}
-
-#if 0
-void init_precoding_weights(PHY_VARS_eNB *eNB) {
-  int layer,ru_id,aa,re,ue,tb;
-  LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
-  RU_t *ru;
-  LTE_eNB_DLSCH_t *dlsch;
-
-  // init precoding weigths
-  for (ue=0; ue<NUMBER_OF_UE_MAX; ue++) {
-    for (tb=0; tb<2; tb++) {
-      dlsch = eNB->dlsch[ue][tb];
-
-      for (layer=0; layer<4; layer++) {
-        int nb_tx=0;
-
-        for (ru_id=0; ru_id<RC.nb_RU; ru_id++) {
-          ru = RC.ru[ru_id];
-          nb_tx+=ru->nb_tx;
-        }
-
-        dlsch->ue_spec_bf_weights[layer] = (int32_t **)malloc16(nb_tx*sizeof(int32_t *));
-
-        for (aa=0; aa<nb_tx; aa++) {
-          dlsch->ue_spec_bf_weights[layer][aa] = (int32_t *)malloc16(fp->ofdm_symbol_size*sizeof(int32_t));
-
-          for (re=0; re<fp->ofdm_symbol_size; re++) {
-            dlsch->ue_spec_bf_weights[layer][aa][re] = 0x00007fff;
-          }
-        }
-      }
-    }
-  }
-}
-#endif
-
-void ocp_rx_prach(PHY_VARS_eNB *eNB,
-                  L1_rxtx_proc_t *proc,
-                  RU_t *ru,
-                  uint16_t *max_preamble,
-                  uint16_t *max_preamble_energy,
-                  uint16_t *max_preamble_delay,
-                  uint16_t *avg_preamble_energy,
-                  uint16_t Nf,
-                  uint8_t tdd_mapindex,
-                  uint8_t br_flag) {
-  int i;
-  int prach_mask=0;
-
-  if (br_flag == 0) {
-    rx_prach0(eNB,ru,proc->frame_prach, proc->subframe_prach,
-              max_preamble,max_preamble_energy,max_preamble_delay,avg_preamble_energy,Nf,tdd_mapindex,0,0);
-  } else { // This is procedure for eMTC, basically handling the repetitions
-    prach_mask = is_prach_subframe(&eNB->frame_parms,proc->frame_prach_br,proc->subframe_prach_br);
-
-    for (i=0; i<4; i++) {
-      if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i]==1) &&
-          ((prach_mask&(1<<(i+1))) > 0)) { // check that prach CE level is active now
-
-        // if first reception in group of repetitions store frame for later (in RA-RNTI for Msg2)
-        if (eNB->prach_vars_br.repetition_number[i]==0)
-          eNB->prach_vars_br.first_frame[i]=proc->frame_prach_br;
-
-        // increment repetition number
-        eNB->prach_vars_br.repetition_number[i]++;
-        // do basic PRACH reception
-        rx_prach0(eNB,ru,proc->frame_prach, proc->subframe_prach_br,
-                  max_preamble,max_preamble_energy,max_preamble_delay,avg_preamble_energy,Nf,tdd_mapindex,1,i);
-
-        // if last repetition, clear counter
-        if (eNB->prach_vars_br.repetition_number[i] == eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[i]) {
-          eNB->prach_vars_br.repetition_number[i]=0;
-        }
-      }
-    } /* for i ... */
-  } /* else br_flag == 0 */
-}
-
-void prach_procedures_ocp(PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, int br_flag) {
-  uint16_t max_preamble[4],max_preamble_energy[4],max_preamble_delay[4],avg_preamble_energy[4];
-  RU_t *ru;
-  int aa=0;
-  int ru_aa;
-
-  for (int i=0; i<eNB->num_RU; i++) {
-    ru=eNB->RU_list[i];
-
-    for (ru_aa=0,aa=0; ru_aa<ru->nb_rx; ru_aa++,aa++) {
-      eNB->prach_vars.rxsigF[0][aa] = eNB->RU_list[i]->prach_rxsigF[0][ru_aa];
-      int ce_level;
-
-      if (br_flag==1)
-        for (ce_level=0; ce_level<4; ce_level++)
-          eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[i]->prach_rxsigF_br[ce_level][ru_aa];
-    }
-  }
-
-  // run PRACH detection for CE-level 0 only for now when br_flag is set
-  ocp_rx_prach(eNB,
-               proc,
-               eNB->RU_list[0],
-               &max_preamble[0],
-               &max_preamble_energy[0],
-               &max_preamble_delay[0],
-               &avg_preamble_energy[0],
-               proc->frame_prach,
-               0
-               ,br_flag
-              );
-  LOG_D(PHY,"RACH detection index 0: max preamble: %u, energy: %u, delay: %u, avg energy: %u\n",
-        max_preamble[0],
-        max_preamble_energy[0],
-        max_preamble_delay[0],
-        avg_preamble_energy[0]
-       );
-
-  if (br_flag==1) {
-    int             prach_mask;
-    prach_mask = is_prach_subframe (&eNB->frame_parms, proc->frame_prach_br, proc->subframe_prach_br);
-    eNB->UL_INFO.rach_ind_br.rach_indication_body.preamble_list = eNB->preamble_list_br;
-    int             ind = 0;
-    int             ce_level = 0;
-    /* Save for later, it doesn't work
-       for (int ind=0,ce_level=0;ce_level<4;ce_level++) {
-
-       if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1)&&
-       (prach_mask&(1<<(1+ce_level)) > 0) && // prach is active and CE level has finished its repetitions
-       (eNB->prach_vars_br.repetition_number[ce_level]==
-       eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level])) {
-
-    */
-
-    if (eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[0] == 1) {
-      if ((eNB->prach_energy_counter == 100) && (max_preamble_energy[0] > eNB->measurements.prach_I0 + eNB->prach_DTX_threshold_emtc[0])) {
-        eNB->UL_INFO.rach_ind_br.rach_indication_body.number_of_preambles++;
-        eNB->preamble_list_br[ind].preamble_rel8.timing_advance = max_preamble_delay[ind];      //
-        eNB->preamble_list_br[ind].preamble_rel8.preamble = max_preamble[ind];
-        // note: fid is implicitly 0 here, this is the rule for eMTC RA-RNTI from 36.321, Section 5.1.4
-        eNB->preamble_list_br[ind].preamble_rel8.rnti = 1 + proc->subframe_prach + (60*(eNB->prach_vars_br.first_frame[ce_level] % 40));
-        eNB->preamble_list_br[ind].instance_length = 0; //don't know exactly what this is
-        eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type = 1 + ce_level;    // CE Level
-        LOG_I (PHY, "Filling NFAPI indication for RACH %d CELevel %d (mask %x) : TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
-               ind,
-               ce_level,
-               prach_mask,
-               eNB->preamble_list_br[ind].preamble_rel8.timing_advance,
-               eNB->preamble_list_br[ind].preamble_rel8.preamble, eNB->preamble_list_br[ind].preamble_rel8.rnti, eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type);
-      }
-    }
-
-    /*
-      ind++;
-      }
-      } */// ce_level
-  } else if ((eNB->prach_energy_counter == 100) &&
-             (max_preamble_energy[0] > eNB->measurements.prach_I0+eNB->prach_DTX_threshold)) {
-    LOG_I(PHY,"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d\n",
-          eNB->Mod_id,
-          eNB->CC_id,
-          proc->frame_prach,
-          proc->subframe_prach,
-          max_preamble[0],
-          max_preamble_energy[0]/10,
-          max_preamble_energy[0]%10,
-          max_preamble_delay[0]);
-    pthread_mutex_lock(&eNB->UL_INFO_mutex);
-    eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles  = 1;
-    eNB->UL_INFO.rach_ind.rach_indication_body.preamble_list        = &eNB->preamble_list[0];
-    eNB->UL_INFO.rach_ind.rach_indication_body.tl.tag               = NFAPI_RACH_INDICATION_BODY_TAG;
-    eNB->UL_INFO.rach_ind.header.message_id                         = NFAPI_RACH_INDICATION;
-    eNB->UL_INFO.rach_ind.sfn_sf                                    = proc->frame_prach<<4 | proc->subframe_prach;
-    eNB->preamble_list[0].preamble_rel8.tl.tag                = NFAPI_PREAMBLE_REL8_TAG;
-    eNB->preamble_list[0].preamble_rel8.timing_advance        = max_preamble_delay[0];
-    eNB->preamble_list[0].preamble_rel8.preamble              = max_preamble[0];
-    eNB->preamble_list[0].preamble_rel8.rnti                  = 1+proc->subframe_prach;  // note: fid is implicitly 0 here
-    eNB->preamble_list[0].preamble_rel13.rach_resource_type   = 0;
-    eNB->preamble_list[0].instance_length                     = 0; //don't know exactly what this is
-
-    if (NFAPI_MODE==NFAPI_MODE_PNF) {  // If NFAPI PNF then we need to send the message to the VNF
-      LOG_D(PHY,"Filling NFAPI indication for RACH : SFN_SF:%d TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
-            NFAPI_SFNSF2DEC(eNB->UL_INFO.rach_ind.sfn_sf),
-            eNB->preamble_list[0].preamble_rel8.timing_advance,
-            eNB->preamble_list[0].preamble_rel8.preamble,
-            eNB->preamble_list[0].preamble_rel8.rnti,
-            eNB->preamble_list[0].preamble_rel13.rach_resource_type);
-      oai_nfapi_rach_ind(&eNB->UL_INFO.rach_ind);
-      eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 0;
-    }
-
-    pthread_mutex_unlock(&eNB->UL_INFO_mutex);
-  } // max_preamble_energy > prach_I0 + 100
-  else {
-    eNB->measurements.prach_I0 = ((eNB->measurements.prach_I0*900)>>10) + ((avg_preamble_energy[0]*124)>>10);
-
-    if (eNB->prach_energy_counter < 100)
-      eNB->prach_energy_counter++;
-  }
-} // else br_flag
-
-void prach_eNB(PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, int frame,int subframe) {
-  // check if we have to detect PRACH first
-  if (is_prach_subframe(&eNB->frame_parms, frame,subframe)>0) {
-    prach_procedures_ocp(eNB, proc, 0);
-    prach_procedures_ocp(eNB, proc, 1);
-  }
-}
-
-static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name) {
-  AssertFatal( eNB !=NULL, "");
-
-  if (NFAPI_MODE==NFAPI_MODE_PNF) {
-    // I am a PNF and I need to let nFAPI know that we have a (sub)frame tick
-    //add_subframe(&frame, &subframe, 4);
-    //oai_subframe_ind(proc->frame_tx, proc->subframe_tx);
-    oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
-  }
-
-  AssertFatal( !(NFAPI_MODE==NFAPI_MODE_PNF &&
-                 eNB->pdcch_vars[proc->subframe_tx&1].num_pdcch_symbols == 0), "");
-  prach_eNB(eNB,proc,proc->frame_rx,proc->subframe_rx);
-  release_UE_in_freeList(eNB->Mod_id);
-
-  // UE-specific RX processing for subframe n
-  if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
-    phy_procedures_eNB_uespec_RX(eNB, proc);
-  }
-
-  pthread_mutex_lock(&eNB->UL_INFO_mutex);
-  eNB->UL_INFO.frame     = proc->frame_rx;
-  eNB->UL_INFO.subframe  = proc->subframe_rx;
-  eNB->UL_INFO.module_id = eNB->Mod_id;
-  eNB->UL_INFO.CC_id     = eNB->CC_id;
-  eNB->if_inst->UL_indication(&eNB->UL_INFO, proc);
-  pthread_mutex_unlock(&eNB->UL_INFO_mutex);
-  phy_procedures_eNB_TX(eNB, proc, 1);
-  return(0);
-}
-
-void rx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
-  LTE_DL_FRAME_PARMS *fp = ru->frame_parms;
-  void *rxp[ru->nb_rx];
-  unsigned int rxs;
-  int i;
-  openair0_timestamp ts=0, timestamp_rx;
-  static openair0_timestamp old_ts=0;
-
-  for (i=0; i<ru->nb_rx; i++)
-    //receive in the next slot
-    rxp[i] = (void *)&ru->common.rxdata[i][((proc->subframe_rx+1)%10)*fp->samples_per_tti];
-
-  rxs = ru->rfdevice.trx_read_func(&ru->rfdevice,
-                                   &ts,
-                                   rxp,
-                                   fp->samples_per_tti,
-                                   ru->nb_rx);
-  timestamp_rx = ts-ru->ts_offset;
-
-  //  AssertFatal(rxs == fp->samples_per_tti,
-  //        "rx_rf: Asked for %d samples, got %d from SDR\n",fp->samples_per_tti,rxs);
-  if(rxs != fp->samples_per_tti) {
-    LOG_E(PHY,"rx_rf: Asked for %d samples, got %d from SDR\n",fp->samples_per_tti,rxs);
-#if defined(USRP_REC_PLAY)
-    exit_fun("Exiting IQ record/playback");
-#else
-    //exit_fun( "problem receiving samples" );
-    LOG_E(PHY, "problem receiving samples");
-#endif
-  }
-
-  if (old_ts != 0 && timestamp_rx - old_ts != fp->samples_per_tti) {
-    LOG_E(HW,"impossible shift in rx stream, rx: %ld, previous rx distance: %ld, should be %d\n", timestamp_rx, proc->timestamp_rx - old_ts, fp->samples_per_tti);
-    //ru->ts_offset += (proc->timestamp_rx - old_ts - fp->samples_per_tti);
-    //proc->timestamp_rx = ts-ru->ts_offset;
-  }
-
-  old_ts=timestamp_rx;
-  setAllfromTS(timestamp_rx, proc);
-}
-
-void ocp_tx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
-  LTE_DL_FRAME_PARMS *fp = ru->frame_parms;
-  void *txp[ru->nb_tx];
-  int i;
-  lte_subframe_t SF_type     = subframe_select(fp,proc->subframe_tx%10);
-  lte_subframe_t prevSF_type = subframe_select(fp,(proc->subframe_tx+9)%10);
-  int sf_extension = 0;
-
-  if ((SF_type == SF_DL) ||
-      (SF_type == SF_S)) {
-    int siglen=fp->samples_per_tti;
-    radio_tx_burst_flag_t flags = TX_BURST_MIDDLE;
-
-    if (SF_type == SF_S) {
-      /* end_of_burst_delay is used to stop TX only "after a while".
-       * If we stop right after effective signal, with USRP B210 and
-       * B200mini, we observe a high EVM on the S subframe (on the
-       * PSS).
-       * A value of 400 (for 30.72MHz) solves this issue. This is
-       * the default.
-       */
-      siglen = (fp->ofdm_symbol_size + fp->nb_prefix_samples0)
-               + (fp->dl_symbols_in_S_subframe - 1) * (fp->ofdm_symbol_size + fp->nb_prefix_samples)
-               + ru->end_of_burst_delay;
-      flags = TX_BURST_END;
-    }
-
-    if (fp->frame_type == TDD &&
-        SF_type == SF_DL &&
-        prevSF_type == SF_UL) {
-      flags = TX_BURST_START;
-      sf_extension = ru->sf_extension;
-    }
-
-#if defined(__x86_64) || defined(__i386__)
-    sf_extension = (sf_extension)&0xfffffff8;
-#elif defined(__arm__) || defined(__aarch64__)
-    sf_extension = (sf_extension)&0xfffffffc;
-#endif
-
-    for (i=0; i<ru->nb_tx; i++)
-      txp[i] = (void *)&ru->common.txdata[i][(proc->subframe_tx*fp->samples_per_tti)-sf_extension];
-
-    /* add fail safe for late command end */
-    // prepare tx buffer pointers
-    ru->rfdevice.trx_write_func(&ru->rfdevice,
-                                proc->timestamp_tx+ru->ts_offset-ru->openair0_cfg.tx_sample_advance-sf_extension,
-                                txp,
-                                siglen+sf_extension,
-                                ru->nb_tx,
-                                flags);
-    LOG_D(PHY,"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, subframe %d\n",ru->idx,
-          (long long unsigned int)proc->timestamp_tx,proc->frame_tx,proc->subframe_tx);
-  }
-
-  return;
-}
-
-static void *ru_thread( void *param ) {
-  setbuf(stdout, NULL);
-  setbuf(stderr, NULL);
-  RU_t *ru = (RU_t *)param;
-  L1_rxtx_proc_t L1proc= {0};
-  // We pick the global thread pool from the legacy code global vars
-  L1proc.threadPool=RC.eNB[0][0]->proc.L1_proc.threadPool;
-  L1proc.respEncode=RC.eNB[0][0]->proc.L1_proc.respEncode;
-  L1proc.respDecode=RC.eNB[0][0]->proc.L1_proc.respDecode;
-
-  if (ru->if_south == LOCAL_RF) { // configure RF parameters only
-    fill_rf_config(ru,ru->rf_config_file);
-    init_frame_parms(ru->frame_parms,1);
-    phy_init_RU(ru);
-    init_rf(ru);
-  }
-
-  AssertFatal(setup_RU_buffers(ru)==0, "Exiting, cannot initialize RU Buffers\n");
-  LOG_I(PHY, "Signaling main thread that RU %d is ready\n",ru->idx);
-  wait_sync("ru_thread");
-
-  // Start RF device if any
-  if (ru->rfdevice.trx_start_func(&ru->rfdevice) != 0)
-    LOG_E(HW,"Could not start the RF device\n");
-  else
-    LOG_I(PHY,"RU %d rf device ready\n",ru->idx);
-
-  // This is a forever while loop, it loops over subframes which are scheduled by incoming samples from HW devices
-  while (!oai_exit) {
-    // synchronization on input FH interface, acquire signals/data and block
-    rx_rf(ru, &L1proc);
-    // do RX front-end processing (frequency-shift, dft) if needed
-    fep_full(ru, L1proc.subframe_rx);
-
-    // At this point, all information for subframe has been received on FH interface
-    // If this proc is to provide synchronization, do so
-    // Fixme: not used
-    // wakeup_slaves(proc);
-    for (int i=0; i<ru->num_eNB; i++) {
-      char string[20];
-      sprintf(string,"Incoming RU %d",ru->idx);
-
-      if (rxtx(ru->eNB_list[i],&L1proc,string) < 0)
-        LOG_E(PHY,"eNB %d CC_id %d failed during execution\n",
-              ru->eNB_list[i]->Mod_id,ru->eNB_list[i]->CC_id);
-    }
-
-    // do TX front-end processing if needed (precoding and/or IDFTs)
-    feptx_prec(ru, L1proc.frame_tx, L1proc.subframe_tx);
-    // do OFDM if needed
-    feptx_ofdm(ru, L1proc.frame_tx, L1proc.subframe_tx);
-    // do outgoing fronthaul (south) if needed
-    ocp_tx_rf(ru, &L1proc);
-  }
-
-  LOG_W(PHY,"Exiting ru_thread \n");
-  ru->rfdevice.trx_end_func(&ru->rfdevice);
-  LOG_I(PHY,"RU %d rf device stopped\n",ru->idx);
-  return NULL;
-}
-
-int init_rf(RU_t *ru) {
-  char name[256];
-  pthread_getname_np(pthread_self(),name, 255);
-  pthread_setname_np(pthread_self(),"UHD for OAI");
-  int ret=openair0_device_load(&ru->rfdevice,&ru->openair0_cfg);
-  pthread_setname_np(pthread_self(),name);
-  return ret;
-}
-
-void ocp_init_RU(RU_t *ru, char *rf_config_file, int send_dmrssync) {
-  PHY_VARS_eNB *eNB0= (PHY_VARS_eNB *)NULL;
-  int i;
-  int CC_id;
-  // read in configuration file)
-  LOG_I(PHY,"configuring RU from file\n");
-  LOG_I(PHY,"number of L1 instances %d, number of RU %d, number of CPU cores %d\n",
-        RC.nb_L1_inst,RC.nb_RU,get_nprocs());
-
-  if (RC.nb_CC != 0)
-    for (i=0; i<RC.nb_L1_inst; i++)
-      for (CC_id=0; CC_id<RC.nb_CC[i]; CC_id++)
-        RC.eNB[i][CC_id]->num_RU=0;
-
-  LOG_D(PHY,"Process RUs RC.nb_RU:%d\n",RC.nb_RU);
-  ru->rf_config_file = rf_config_file;
-  ru->idx          = 0;
-  ru->ts_offset    = 0;
-
-  if (ru->is_slave == 1) {
-    ru->in_synch    = 0;
-    ru->generate_dmrs_sync = 0;
-  } else {
-    ru->in_synch    = 1;
-    ru->generate_dmrs_sync=send_dmrssync;
-  }
-
-  ru->cmd      = EMPTY;
-  ru->south_out_cnt= 0;
-
-  //    ru->generate_dmrs_sync = (ru->is_slave == 0) ? 1 : 0;
-  if (ru->generate_dmrs_sync == 1) {
-    generate_ul_ref_sigs();
-    ru->dmrssync = (int16_t *)malloc16_clear(ru->frame_parms->ofdm_symbol_size*2*sizeof(int16_t));
-  }
-
-  ru->wakeup_L1_sleeptime = 2000;
-  ru->wakeup_L1_sleep_cnt_max  = 3;
-
-  if (ru->num_eNB > 0) {
-    AssertFatal(ru->eNB_list[0], "ru->eNB_list is not initialized\n");
-  } else {
-    LOG_E(PHY,"Wrong data model, assigning eNB 0, carrier 0 to RU 0\n");
-    ru->eNB_list[0] = RC.eNB[0][0];
-    ru->num_eNB=1;
-  }
-
-  eNB0 = ru->eNB_list[0];
-  // datamodel error in regular OAI: a RU uses one single eNB carrier parameters!
-  ru->frame_parms = &eNB0->frame_parms;
-
-  for (i=0; i<ru->num_eNB; i++) {
-    eNB0 = ru->eNB_list[i];
-    int ruIndex=eNB0->num_RU++;
-    eNB0->RU_list[ruIndex] = ru;
-  }
-}
-
-void stop_RU(int nb_ru) {
-  for (int inst = 0; inst < nb_ru; inst++) {
-    LOG_I(PHY, "Stopping RU %d processing threads\n", inst);
-    //kill_RU_proc(RC.ru[inst]);
-  }
-}
-
-/* --------------------------------------------------------*/
-/* from here function to use configuration module          */
-static int DEFBFW[] = {0x00007fff};
-void ocpRCconfig_RU(RU_t *ru) {
-  paramdef_t RUParams[] = RUPARAMS_DESC;
-  paramlist_def_t RUParamList = {CONFIG_STRING_RU_LIST,NULL,0};
-  config_getlist( &RUParamList,RUParams,sizeof(RUParams)/sizeof(paramdef_t), NULL);
-
-  if ( RUParamList.numelt == 0  ) {
-    LOG_W(PHY, "Calling RCconfig_RU while no ru\n");
-    RC.nb_RU = 0;
-    return;
-  } // setting != NULL
-
-  ru->idx = 0;
-  ru->if_timing = synch_to_ext_device;
-  paramdef_t *vals=RUParamList.paramarray[0];
-
-  if (RC.nb_L1_inst >0)
-    ru->num_eNB = vals[RU_ENB_LIST_IDX].numelt;
-  else
-    ru->num_eNB = 0;
-
-  for (int i=0; i<ru->num_eNB; i++)
-    ru->eNB_list[i] = RC.eNB[vals[RU_ENB_LIST_IDX].iptr[i]][0];
-
-  if (config_isparamset(vals, RU_SDR_ADDRS)) {
-    ru->openair0_cfg.sdr_addrs = strdup(*(vals[RU_SDR_ADDRS].strptr));
-  }
-
-  if (config_isparamset(vals, RU_SDR_CLK_SRC)) {
-    char *paramVal=*(vals[RU_SDR_CLK_SRC].strptr);
-    LOG_D(PHY, "RU clock source set as %s\n", paramVal);
-
-    if (strcmp(paramVal, "internal") == 0) {
-      ru->openair0_cfg.clock_source = internal;
-    } else if (strcmp(paramVal, "external") == 0) {
-      ru->openair0_cfg.clock_source = external;
-    } else if (strcmp(paramVal, "gpsdo") == 0) {
-      ru->openair0_cfg.clock_source = gpsdo;
-    } else {
-      LOG_E(PHY, "Erroneous RU clock source in the provided configuration file: '%s'\n", paramVal);
-    }
-  }
-
-  if (strcmp(*(vals[RU_LOCAL_RF_IDX].strptr), "yes") == 0) {
-    if ( !(config_isparamset(vals,RU_LOCAL_IF_NAME_IDX)) ) {
-      ru->if_south  = LOCAL_RF;
-      ru->function  = eNodeB_3GPP;
-    } else {
-      ru->eth_params.local_if_name = strdup(*(vals[RU_LOCAL_IF_NAME_IDX].strptr));
-      ru->eth_params.my_addr       = strdup(*(vals[RU_LOCAL_ADDRESS_IDX].strptr));
-      ru->eth_params.remote_addr   = strdup(*(vals[RU_REMOTE_ADDRESS_IDX].strptr));
-      ru->eth_params.my_portc      = *(vals[RU_LOCAL_PORTC_IDX].uptr);
-      ru->eth_params.remote_portc  = *(vals[RU_REMOTE_PORTC_IDX].uptr);
-      ru->eth_params.my_portd      = *(vals[RU_LOCAL_PORTD_IDX].uptr);
-      ru->eth_params.remote_portd  = *(vals[RU_REMOTE_PORTD_IDX].uptr);
-    }
-
-    ru->max_pdschReferenceSignalPower = *(vals[RU_MAX_RS_EPRE_IDX].uptr);;
-    ru->max_rxgain                    = *(vals[RU_MAX_RXGAIN_IDX].uptr);
-    ru->num_bands                     = vals[RU_BAND_LIST_IDX].numelt;
-    /* sf_extension is in unit of samples for 30.72MHz here, has to be scaled later */
-    ru->sf_extension                  = *(vals[RU_SF_EXTENSION_IDX].uptr);
-    ru->end_of_burst_delay            = *(vals[RU_END_OF_BURST_DELAY_IDX].uptr);
-
-    for (int i=0; i<ru->num_bands; i++)
-      ru->band[i] = vals[RU_BAND_LIST_IDX].iptr[i];
-  } else {
-    ru->eth_params.local_if_name    = strdup(*(vals[RU_LOCAL_IF_NAME_IDX].strptr));
-    ru->eth_params.my_addr          = strdup(*(vals[RU_LOCAL_ADDRESS_IDX].strptr));
-    ru->eth_params.remote_addr      = strdup(*(vals[RU_REMOTE_ADDRESS_IDX].strptr));
-    ru->eth_params.my_portc         = *(vals[RU_LOCAL_PORTC_IDX].uptr);
-    ru->eth_params.remote_portc     = *(vals[RU_REMOTE_PORTC_IDX].uptr);
-    ru->eth_params.my_portd         = *(vals[RU_LOCAL_PORTD_IDX].uptr);
-    ru->eth_params.remote_portd     = *(vals[RU_REMOTE_PORTD_IDX].uptr);
-  }  /* strcmp(local_rf, "yes") != 0 */
-
-  ru->nb_tx                             = *(vals[RU_NB_TX_IDX].uptr);
-  ru->nb_rx                             = *(vals[RU_NB_RX_IDX].uptr);
-  ru->att_tx                            = *(vals[RU_ATT_TX_IDX].uptr);
-  ru->att_rx                            = *(vals[RU_ATT_RX_IDX].uptr);
-  return;
-}
-
-
-static void get_options(void) {
-  CONFIG_SETRTFLAG(CONFIG_NOEXITONHELP);
-  get_common_options(SOFTMODEM_ENB_BIT);
-  CONFIG_CLEARRTFLAG(CONFIG_NOEXITONHELP);
-
-  if ( !(CONFIG_ISFLAGSET(CONFIG_ABORT)) ) {
-    memset((void *)&RC,0,sizeof(RC));
-    /* Read RC configuration file */
-    RCConfig();
-    NB_eNB_INST = RC.nb_inst;
-    printf("Configuration: nb_rrc_inst %d, nb_L1_inst %d, nb_ru %d\n",NB_eNB_INST,RC.nb_L1_inst,RC.nb_RU);
-
-    if (!IS_SOFTMODEM_NONBIOT) {
-      load_NB_IoT();
-      printf("               nb_nbiot_rrc_inst %d, nb_nbiot_L1_inst %d, nb_nbiot_macrlc_inst %d\n",
-             RC.nb_nb_iot_rrc_inst, RC.nb_nb_iot_L1_inst, RC.nb_nb_iot_macrlc_inst);
-    } else {
-      printf("All Nb-IoT instances disabled\n");
-      RC.nb_nb_iot_rrc_inst=RC.nb_nb_iot_L1_inst=RC.nb_nb_iot_macrlc_inst=0;
-    }
-  }
-}
-
-void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) {
-  int CC_id;
-
-  for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    frame_parms[CC_id] = (LTE_DL_FRAME_PARMS *) malloc(sizeof(LTE_DL_FRAME_PARMS));
-    /* Set some default values that may be overwritten while reading options */
-    frame_parms[CC_id]->frame_type          = FDD;
-    frame_parms[CC_id]->tdd_config          = 3;
-    frame_parms[CC_id]->tdd_config_S        = 0;
-    frame_parms[CC_id]->N_RB_DL             = 100;
-    frame_parms[CC_id]->N_RB_UL             = 100;
-    frame_parms[CC_id]->Ncp                 = NORMAL;
-    frame_parms[CC_id]->Ncp_UL              = NORMAL;
-    frame_parms[CC_id]->Nid_cell            = 0;
-    frame_parms[CC_id]->num_MBSFN_config    = 0;
-    frame_parms[CC_id]->nb_antenna_ports_eNB  = 1;
-    frame_parms[CC_id]->nb_antennas_tx      = 1;
-    frame_parms[CC_id]->nb_antennas_rx      = 1;
-    frame_parms[CC_id]->nushift             = 0;
-    frame_parms[CC_id]->phich_config_common.phich_resource = oneSixth;
-    frame_parms[CC_id]->phich_config_common.phich_duration = normal;
-    // UL RS Config
-    frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = 0;//n_DMRS1 set to 0
-    frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = 0;
-    frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = 0;
-    frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = 0;
-    frame_parms[CC_id]->prach_config_common.rootSequenceIndex=22;
-    frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig=1;
-    frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_ConfigIndex=0;
-    frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.highSpeedFlag=0;
-    frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_FreqOffset=0;
-    //    downlink_frequency[CC_id][0] = 2680000000; // Use float to avoid issue with frequency over 2^31.
-    //    downlink_frequency[CC_id][1] = downlink_frequency[CC_id][0];
-    //    downlink_frequency[CC_id][2] = downlink_frequency[CC_id][0];
-    //    downlink_frequency[CC_id][3] = downlink_frequency[CC_id][0];
-    //printf("Downlink for CC_id %d frequency set to %u\n", CC_id, downlink_frequency[CC_id][0]);
-    frame_parms[CC_id]->dl_CarrierFreq=downlink_frequency[CC_id][0];
-  }
-}
-
-void init_pdcp(void) {
-  pdcp_layer_init();
-  uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
-                           (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
-
-  if (IS_SOFTMODEM_NOS1)
-    pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT  ;
-
-  pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_W_MBMS_BIT;
-
-  if ( split73!=SPLIT73_DU)
-    pdcp_module_init(pdcp_initmask, 0);
-
-  pdcp_set_rlc_data_req_func(rlc_data_req);
-  pdcp_set_pdcp_data_ind_func(pdcp_data_ind);
-  }
-}
-
-static  void wait_nfapi_init(char *thread_name) {
-  LOG_I(ENB_APP, "waiting for NFAPI PNF connection and population of global structure (%s)\n",thread_name);
-  pthread_mutex_lock( &nfapi_sync_mutex );
-
-  while (nfapi_sync_var<0)
-    pthread_cond_wait( &nfapi_sync_cond, &nfapi_sync_mutex );
-
-  pthread_mutex_unlock(&nfapi_sync_mutex);
-  LOG_I(ENB_APP, "NFAPI: got sync (%s)\n", thread_name);
-}
-
-void terminate_task(module_id_t mod_id, task_id_t from, task_id_t to) {
-  LOG_I(ENB_APP, "sending TERMINATE_MESSAGE from task %s (%d) to task %s (%d)\n",
-        itti_get_task_name(from), from, itti_get_task_name(to), to);
-  MessageDef *msg;
-  msg = itti_alloc_new_message (from, 0, TERMINATE_MESSAGE);
-  itti_send_msg_to_task (to, ENB_MODULE_ID_TO_INSTANCE(mod_id), msg);
-}
-
-int main ( int argc, char **argv ) {
-  //mtrace();
-  int i;
-  int CC_id = 0;
-  sf_ahead=4; // Bell Labs
-  AssertFatal(load_configmodule(argc,argv,0), "[SOFTMODEM] Error, configuration module init failed\n");
-  logInit();
-  printf("Reading in command-line options\n");
-  get_options ();
-  AssertFatal(!CONFIG_ISFLAGSET(CONFIG_ABORT),"Getting configuration failed\n");
-  EPC_MODE_ENABLED = !IS_SOFTMODEM_NOS1;
-#if T_TRACER
-  T_Config_Init();
-#endif
-  set_latency_target();
-  set_softmodem_sighandler();
-  cpuf=get_cpu_freq_GHz();
-  set_taus_seed (0);
-
-  if (opp_enabled ==1)
-    reset_opp_meas();
-
-  itti_init(TASK_MAX, tasks_info);
-  init_opt();
-#ifndef PACKAGE_VERSION
-#  define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
-#endif
-  LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
-
-  /* Read configuration */
-  if (RC.nb_inst > 0) {
-    // Allocate memory from RC variable
-    read_config_and_init();
-  } else {
-    printf("RC.nb_inst = 0, Initializing L1\n");
-    RCconfig_L1();
-  }
-
-  // RU thread and some L1 procedure aren't necessary in VNF or L2 FAPI simulator.
-  // but RU thread deals with pre_scd and this is necessary in VNF and simulator.
-  // some initialization is necessary and init_ru_vnf do this.
-  RU_t ru;
-
-  if  ( NFAPI_MODE != NFAPI_MODE_VNF) {
-    ocpRCconfig_RU(&ru);
-    LOG_I(PHY,
-          "number of L1 instances %d, number of RU %d, number of CPU cores %d\n",
-          RC.nb_L1_inst, RC.nb_RU, get_nprocs());
-  }
-
-  if ( strlen(get_softmodem_params()->split73) > 0 ) {
-    char tmp[1024]= {0};
-    strncpy(tmp,get_softmodem_params()->split73, 1023);
-    tmp[2]=0;
-
-    if ( strncasecmp(tmp,"cu", 2)==0 )
-      split73=SPLIT73_CU;
-    else if ( strncasecmp(tmp,"du", 2)==0 )
-      split73=SPLIT73_DU;
-    else
-      AssertFatal(false,"split73 syntax: <cu|du>:<remote ip addr>[:<ip port>] (string found: %s) \n",get_softmodem_params()->split73);
-  }
-
-  if (RC.nb_inst > 0) {
-    /* Start the agent. If it is turned off in the configuration, it won't start */
-
-    /* initializes PDCP and sets correct RLC Request/PDCP Indication callbacks */
-    init_pdcp();
-    AssertFatal(create_tasks(1)==0,"cannot create ITTI tasks\n");
-
-    for (int enb_id = 0; enb_id < RC.nb_inst; enb_id++) {
-      MessageDef *msg_p = itti_alloc_new_message (TASK_ENB_APP, 0, RRC_CONFIGURATION_REQ);
-      RRC_CONFIGURATION_REQ(msg_p) = RC.rrc[enb_id]->configuration;
-      itti_send_msg_to_task (TASK_RRC_ENB, ENB_MODULE_ID_TO_INSTANCE(enb_id), msg_p);
-    }
-  }
-
-  if (RC.nb_inst > 0) {
-    protocol_ctxt_t ctxt;
-    ctxt.module_id = 0 ;
-    ctxt.instance = 0;
-    ctxt.rnti = 0;
-    ctxt.enb_flag = 1;
-    ctxt.frame = 0;
-    ctxt.subframe = 0;
-    pdcp_run(&ctxt);
-  }
-
-  /* start threads if only L1 or not a CU */
-  if (RC.nb_inst == 0 || NFAPI_MODE == NFAPI_MODE_PNF || NFAPI_MODE == NFAPI_MODE_VNF) {
-    // init UE_PF_PO and mutex lock
-    pthread_mutex_init(&ue_pf_po_mutex, NULL);
-    memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*MAX_MOBILES_PER_ENB*MAX_NUM_CCs);
-    pthread_cond_init(&sync_cond,NULL);
-    pthread_mutex_init(&sync_mutex, NULL);
-
-    if (NFAPI_MODE!=NFAPI_MONOLITHIC) {
-      LOG_I(ENB_APP,"NFAPI*** - mutex and cond created - will block shortly for completion of PNF connection\n");
-      pthread_cond_init(&sync_cond,NULL);
-      pthread_mutex_init(&sync_mutex, NULL);
-    }
-
-    if (NFAPI_MODE==NFAPI_MODE_VNF) {// VNF
-#if defined(PRE_SCD_THREAD)
-      init_ru_vnf();  // ru pointer is necessary for pre_scd.
-#endif
-      wait_nfapi_init("main?");
-    }
-
-    LOG_I(ENB_APP,"START MAIN THREADS\n");
-    // start the main threads
-    number_of_cards = 1;
-    printf("RC.nb_L1_inst:%d\n", RC.nb_L1_inst);
-
-    if (RC.nb_L1_inst > 0) {
-      printf("Initializing eNB threads single_thread_flag:%d wait_for_sync:%d\n",
-             get_softmodem_params()->single_thread_flag,
-             get_softmodem_params()->wait_for_sync);
-      init_eNB(get_softmodem_params()->single_thread_flag,
-               get_softmodem_params()->wait_for_sync);
-    }
-
-    for (int x=0; x < RC.nb_L1_inst; x++)
-      for (int CC_id=0; CC_id<RC.nb_L1_CC[x]; CC_id++) {
-        L1_rxtx_proc_t *L1proc= &RC.eNB[x][CC_id]->proc.L1_proc;
-        L1proc->threadPool=(tpool_t *)malloc(sizeof(tpool_t));
-        L1proc->respEncode=(notifiedFIFO_t *) malloc(sizeof(notifiedFIFO_t));
-        L1proc->respDecode=(notifiedFIFO_t *) malloc(sizeof(notifiedFIFO_t));
-
-        initTpool(get_softmodem_params()->threadPoolConfig, L1proc->threadPool,cpumeas(CPUMEAS_GETSTATE));
-        initNotifiedFIFO(L1proc->respEncode);
-        initNotifiedFIFO(L1proc->respDecode);
-      }
-  }
-
-  printf("About to Init RU threads RC.nb_RU:%d\n", RC.nb_RU);
-
-  if (RC.nb_RU >0 && NFAPI_MODE!=NFAPI_MODE_VNF) {
-    printf("Initializing RU threads\n");
-    ocp_init_RU(&ru,
-                get_softmodem_params()->rf_config_file,
-                get_softmodem_params()->send_dmrs_sync);
-    ru.rf_map.card=0;
-    ru.rf_map.chain=CC_id+(get_softmodem_params()->chain_offset);
-    init_RU_proc(&ru);
-    config_sync_var=0;
-
-    if (NFAPI_MODE==NFAPI_MODE_PNF) { // PNF
-      wait_nfapi_init("main?");
-    }
-
-    LOG_I(ENB_APP,"RC.nb_RU:%d\n", RC.nb_RU);
-    // once all RUs are ready intiailize the rest of the eNBs ((dependence on final RU parameters after configuration)
-    printf("ALL RUs ready - init eNBs\n");
-    sleep(1);
-
-    if (NFAPI_MODE!=NFAPI_MODE_PNF && NFAPI_MODE!=NFAPI_MODE_VNF) {
-      LOG_I(ENB_APP,"Not NFAPI mode - call init_eNB_afterRU()\n");
-      init_eNB_afterRU();
-    } else {
-      LOG_I(ENB_APP,"NFAPI mode - DO NOT call init_eNB_afterRU()\n");
-    }
-
-    LOG_UI(ENB_APP,"ALL RUs ready - ALL eNBs ready\n");
-    // connect the TX/RX buffers
-    sleep(1); /* wait for thread activation */
-    LOG_I(ENB_APP,"Sending sync to all threads\n");
-    pthread_mutex_lock(&sync_mutex);
-    sync_var=0;
-    pthread_cond_broadcast(&sync_cond);
-    pthread_mutex_unlock(&sync_mutex);
-    config_check_unknown_cmdlineopt(CONFIG_CHECKALLSECTIONS);
-  }
-
-  create_tasks_mbms(1);
-  // wait for end of program
-  LOG_UI(ENB_APP,"TYPE <CTRL-C> TO TERMINATE\n");
-  // CI -- Flushing the std outputs for the previous marker to show on the eNB / DU / CU log file
-  fflush(stdout);
-  fflush(stderr);
-
-  // end of CI modifications
-  //getchar();
-  if(IS_SOFTMODEM_DOSCOPE)
-    load_softscope("enb", NULL);
-
-  itti_wait_tasks_end();
-  oai_exit=1;
-  LOG_I(ENB_APP,"oai_exit=%d\n",oai_exit);
-  // stop threads
-
-  if (RC.nb_inst == 0) {
-    if(IS_SOFTMODEM_DOSCOPE)
-      end_forms();
-
-    LOG_I(ENB_APP,"stopping MODEM threads\n");
-    stop_eNB(NB_eNB_INST);
-    stop_RU(RC.nb_RU);
-
-    /* release memory used by the RU/eNB threads (incomplete), after all
-     * threads have been stopped (they partially use the same memory) */
-    for (int inst = 0; inst < NB_eNB_INST; inst++) {
-      for (int cc_id = 0; cc_id < RC.nb_CC[inst]; cc_id++) {
-        free_transport(RC.eNB[inst][cc_id]);
-        phy_free_lte_eNB(RC.eNB[inst][cc_id]);
-      }
-    }
-
-    free_lte_top();
-    end_configmodule();
-    pthread_cond_destroy(&sync_cond);
-    pthread_mutex_destroy(&sync_mutex);
-    pthread_cond_destroy(&nfapi_sync_cond);
-    pthread_mutex_destroy(&nfapi_sync_mutex);
-    pthread_mutex_destroy(&ue_pf_po_mutex);
-  }
-
-  terminate_opt();
-  logClean();
-  printf("Bye.\n");
-  return 0;
-}
diff --git a/executables/main_ru.c b/executables/main_ru.c
index 4ee2678337..fcb65dd626 100644
--- a/executables/main_ru.c
+++ b/executables/main_ru.c
@@ -56,7 +56,6 @@
 #include "openair2/ENB_APP/enb_paramdef.h"
 #include "system.h"
 
-#include <executables/split_headers.h>
 #include <executables/softmodem-common.h>
 #include <executables/thread-common.h>
 
diff --git a/executables/nr-cuup.c b/executables/nr-cuup.c
index d35762c4f8..e3abf512eb 100644
--- a/executables/nr-cuup.c
+++ b/executables/nr-cuup.c
@@ -109,7 +109,7 @@ rlc_op_status_t nr_rrc_rlc_config_asn1_req(const protocol_ctxt_t *const ctxt_pP,
   return 0;
 }
 
-int nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(const protocol_ctxt_t *const ctxt_pP, const gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_pP)
+int nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(const protocol_ctxt_t *const ctxt_pP, const gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_p, int offset)
 {
   abort();
   return 0;
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index f3d0b58df5..9cefc7ce4c 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -153,19 +153,8 @@ int otg_enabled;
 uint32_t timing_advance = 0;
 uint64_t num_missed_slots=0; // counter for the number of missed slots
 
-#include <executables/split_headers.h>
 #include <SIMULATION/ETH_TRANSPORT/proto.h>
 
-int split73=0;
-void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
-  AssertFatal(false, "Must not be called in this context\n");
-}
-void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask,
-                   uint16_t rnti, int32_t stat) {
-  AssertFatal(false, "Must not be called in this context\n");
-}
-
-
 extern void reset_opp_meas(void);
 extern void print_opp_meas(void);
 
@@ -715,6 +704,15 @@ int main( int argc, char **argv ) {
       load_softscope("nr",&p);
     }
 
+    if(IS_SOFTMODEM_DOSCOPE_QT) {
+      scopeParms_t p;
+      p.argc = &argc;
+      p.argv = argv;
+      p.gNB  = RC.gNB[0];
+      p.ru   = RC.ru[0];
+      load_softscope("nrqt", &p);
+    }
+
     if (NFAPI_MODE != NFAPI_MODE_PNF && NFAPI_MODE != NFAPI_MODE_VNF) {
       printf("Not NFAPI mode - call init_eNB_afterRU()\n");
       init_eNB_afterRU();
diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
index 5aeb8c76ea..d7ee572b76 100644
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -527,6 +527,10 @@ int main( int argc, char **argv ) {
     memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*NUMBER_OF_UE_MAX*MAX_NUM_CCs);
     set_latency_target();
 
+    if(IS_SOFTMODEM_DOSCOPE_QT) {
+      load_softscope("nrqt",PHY_vars_UE_g[0][0]);
+    }
+
     if(IS_SOFTMODEM_DOSCOPE) {
       load_softscope("nr",PHY_vars_UE_g[0][0]);
     }
diff --git a/executables/softmodem-common.c b/executables/softmodem-common.c
index f0dc5488f9..825faf6cf9 100644
--- a/executables/softmodem-common.c
+++ b/executables/softmodem-common.c
@@ -97,7 +97,7 @@ void get_common_options(uint32_t execmask) {
   uint32_t start_telnetsrv = 0, start_telnetclt = 0;
   uint32_t start_websrv = 0;
   uint32_t noS1 = 0, nokrnmod = 1, nonbiot = 0;
-  uint32_t rfsim = 0, do_forms = 0;
+  uint32_t rfsim = 0, do_forms = 0, do_forms_qt = 0;
   int nfapi_index = 0;
   char *logmem_filename = NULL;
   check_execmask(execmask);
@@ -161,6 +161,10 @@ void get_common_options(uint32_t execmask) {
     set_softmodem_optmask(SOFTMODEM_DOSCOPE_BIT);
   }
 
+  if (do_forms_qt) {
+    set_softmodem_optmask(SOFTMODEM_DOSCOPE_QT_BIT);
+  }
+
   if (start_websrv) {
     load_module_shlib("websrv", NULL, 0, NULL);
   }
diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h
index 1e94085e67..2b022b6a9e 100644
--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
@@ -67,6 +67,7 @@ extern "C"
 #define CONFIG_HLP_ULF           "Set the uplink frequency offset for all component carriers\n"
 #define CONFIG_HLP_CHOFF         "Channel id offset\n"
 #define CONFIG_HLP_SOFTS         "Enable soft scope and L1 and L2 stats (Xforms)\n"
+#define CONFIG_HLP_SOFTS_QT      "Enable soft scope and L1 and L2 stats (QT)\n"
 #define CONFIG_HLP_ITTIL         "Generate ITTI analyzser logs (similar to wireshark logs but with more details)\n"
 #define CONFIG_HLP_DLMCS         "Set the maximum downlink MCS\n"
 #define CONFIG_HLP_STMON         "Enable processing timing measurement of lte softmodem on per subframe basis \n"
@@ -107,7 +108,6 @@ extern "C"
 /*   optname                 helpstr                  paramflags      XXXptr                              defXXXval              type         numelt   */
 /*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
 #define RF_CONFIG_FILE      softmodem_params.rf_config_file
-#define SPLIT73             softmodem_params.split73
 #define TP_CONFIG           softmodem_params.threadPoolConfig
 #define PHY_TEST            softmodem_params.phy_test
 #define DO_RA               softmodem_params.do_ra
@@ -137,7 +137,6 @@ extern "C"
 extern int usrp_tx_thread;
 #define CMDLINE_PARAMS_DESC {  \
     {"rf-config-file",       CONFIG_HLP_RFCFGF,       0,              strptr:&RF_CONFIG_FILE,    defstrval:NULL,        TYPE_STRING, 0},\
-    {"split73",              CONFIG_HLP_SPLIT73,      0,              strptr:&SPLIT73,           defstrval:NULL,        TYPE_STRING, 0},       \
     {"thread-pool",          CONFIG_HLP_TPOOL,        0,              strptr:&TP_CONFIG,         defstrval:"-1,-1,-1,-1,-1,-1,-1,-1",         TYPE_STRING, 0},     \
     {"phy-test",             CONFIG_HLP_PHYTST,       PARAMFLAG_BOOL, iptr:&PHY_TEST,                     defintval:0,           TYPE_INT,    0},                     \
     {"do-ra",                CONFIG_HLP_DORA,         PARAMFLAG_BOOL, iptr:&DO_RA,                        defintval:0,           TYPE_INT,    0},                     \
@@ -151,17 +150,18 @@ extern int usrp_tx_thread;
     {"C" ,                   CONFIG_HLP_DLF,          0,              u64ptr:&(downlink_frequency[0][0]), defuintval:0,          TYPE_UINT64, 0},                     \
     {"CO" ,                  CONFIG_HLP_ULF,          0,              iptr:&(uplink_frequency_offset[0][0]), defintval:0,        TYPE_INT,    0},                     \
     {"a" ,                   CONFIG_HLP_CHOFF,        0,              iptr:&CHAIN_OFFSET,                 defintval:0,           TYPE_INT,    0},                     \
-    {"d" ,                   CONFIG_HLP_SOFTS,        PARAMFLAG_BOOL, uptr:(uint32_t *)&do_forms,         defintval:0,           TYPE_INT8,   0},                     \
+    {"d" ,                   CONFIG_HLP_SOFTS,        PARAMFLAG_BOOL, uptr:&do_forms,                     defintval:0,           TYPE_UINT,   0},                     \
+    {"dqt" ,                 CONFIG_HLP_SOFTS_QT,     PARAMFLAG_BOOL, uptr:&do_forms_qt,                  defintval:0,           TYPE_UINT,   0},                     \
     {"q" ,                   CONFIG_HLP_STMON,        PARAMFLAG_BOOL, iptr:&opp_enabled,                  defintval:0,           TYPE_INT,    0},                     \
     {"numerology" ,          CONFIG_HLP_NUMEROLOGY,   PARAMFLAG_BOOL, iptr:&NUMEROLOGY,                   defintval:1,           TYPE_INT,    0},                     \
     {"band" ,                CONFIG_HLP_BAND,         PARAMFLAG_BOOL, iptr:&BAND,                         defintval:78,          TYPE_INT,    0},                     \
     {"emulate-rf" ,          CONFIG_HLP_EMULATE_RF,   PARAMFLAG_BOOL, iptr:&EMULATE_RF,                   defintval:0,           TYPE_INT,    0},                     \
     {"parallel-config",      CONFIG_HLP_PARALLEL_CMD, 0,              strptr:&parallel_config,   defstrval:NULL,        TYPE_STRING, 0},                     \
     {"worker-config",        CONFIG_HLP_WORKER_CMD,   0,              strptr:&worker_config,     defstrval:NULL,        TYPE_STRING, 0},                     \
-    {"noS1",                 CONFIG_HLP_NOS1,         PARAMFLAG_BOOL, uptr:&noS1,                         defintval:0,           TYPE_INT,    0},                     \
-    {"rfsim",                CONFIG_HLP_RFSIM,        PARAMFLAG_BOOL, uptr:&rfsim,                        defintval:0,           TYPE_INT,    0},                     \
-    {"nokrnmod",             CONFIG_HLP_NOKRNMOD,     PARAMFLAG_BOOL, uptr:&nokrnmod,                     defintval:0,           TYPE_INT,    0},                     \
-    {"nbiot-disable",        CONFIG_HLP_DISABLNBIOT,  PARAMFLAG_BOOL, uptr:&nonbiot,                      defuintval:0,          TYPE_INT,    0},                     \
+    {"noS1",                 CONFIG_HLP_NOS1,         PARAMFLAG_BOOL, uptr:&noS1,                         defintval:0,           TYPE_UINT,   0},                     \
+    {"rfsim",                CONFIG_HLP_RFSIM,        PARAMFLAG_BOOL, uptr:&rfsim,                        defintval:0,           TYPE_UINT,   0},                     \
+    {"nokrnmod",             CONFIG_HLP_NOKRNMOD,     PARAMFLAG_BOOL, uptr:&nokrnmod,                     defintval:0,           TYPE_UINT,   0},                     \
+    {"nbiot-disable",        CONFIG_HLP_DISABLNBIOT,  PARAMFLAG_BOOL, uptr:&nonbiot,                      defuintval:0,          TYPE_UINT,   0},                     \
     {"chest-freq",           CONFIG_HLP_CHESTFREQ,    0,              iptr:&CHEST_FREQ,                   defintval:0,           TYPE_INT,    0},                     \
     {"chest-time",           CONFIG_HLP_CHESTTIME,    0,              iptr:&CHEST_TIME,                   defintval:0,           TYPE_INT,    0},                     \
     {"nsa",                  CONFIG_HLP_NSA,          PARAMFLAG_BOOL, iptr:&NSA,                          defintval:0,           TYPE_INT,    0},                     \
@@ -216,7 +216,6 @@ extern int usrp_tx_thread;
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
-    { .s5 = { NULL } },                     \
 }
 
 #define CONFIG_HLP_NSA           "Enable NSA mode \n"
@@ -265,6 +264,8 @@ extern int usrp_tx_thread;
 #define SOFTMODEM_4GUE_BIT            (1<<22)
 #define SOFTMODEM_5GUE_BIT            (1<<23)
 #define SOFTMODEM_NOSTATS_BIT         (1<<24)
+#define SOFTMODEM_DOSCOPE_QT_BIT      (1<<25)
+
 #define SOFTMODEM_FUNC_BITS (SOFTMODEM_ENB_BIT | SOFTMODEM_GNB_BIT | SOFTMODEM_5GUE_BIT | SOFTMODEM_4GUE_BIT)
 #define MAPPING_SOFTMODEM_FUNCTIONS {{"enb",SOFTMODEM_ENB_BIT},{"gnb",SOFTMODEM_GNB_BIT},{"4Gue",SOFTMODEM_4GUE_BIT},{"5Gue",SOFTMODEM_5GUE_BIT}}
 
@@ -276,6 +277,7 @@ extern int usrp_tx_thread;
 #define IS_SOFTMODEM_SIML1           ( get_softmodem_optmask() & SOFTMODEM_SIML1_BIT)
 #define IS_SOFTMODEM_DLSIM           ( get_softmodem_optmask() & SOFTMODEM_DLSIM_BIT)
 #define IS_SOFTMODEM_DOSCOPE         ( get_softmodem_optmask() & SOFTMODEM_DOSCOPE_BIT)
+#define IS_SOFTMODEM_DOSCOPE_QT      ( get_softmodem_optmask() & SOFTMODEM_DOSCOPE_QT_BIT)
 #define IS_SOFTMODEM_IQPLAYER        ( get_softmodem_optmask() & SOFTMODEM_RECPLAY_BIT)
 #define IS_SOFTMODEM_IQRECORDER      ( get_softmodem_optmask() & SOFTMODEM_RECRECORD_BIT)
 #define IS_SOFTMODEM_TELNETCLT_BIT   ( get_softmodem_optmask() & SOFTMODEM_TELNETCLT_BIT)    
@@ -289,7 +291,6 @@ typedef struct {
   uint64_t       optmask;
   //THREAD_STRUCT  thread_struct;
   char           *rf_config_file;
-  char           *split73;
   char           *threadPoolConfig;
   int            phy_test;
   int            do_ra;
diff --git a/executables/split_headers.h b/executables/split_headers.h
deleted file mode 100644
index dc451773c5..0000000000
--- a/executables/split_headers.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
-* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The OpenAirInterface Software Alliance licenses this file to You under
-* the OAI Public License, Version 1.1  (the "License"); you may not use this file
-* except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.openairinterface.org/?page_id=698
-*
-* Author and copyright: Laurent Thomas, open-cells.com
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*-------------------------------------------------------------------------------
-* For more information about the OpenAirInterface (OAI) Software Alliance:
-*      contact@openairinterface.org
-*/
-
-
-#ifndef __SPLIT_HEADERS_H
-#define __SPLIT_HEADERS_H
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <openair1/PHY/defs_eNB.h>
-#include <common/utils/telnetsrv/telnetsrv_proccmd.h>
-
-#define CU_PORT "7878"
-#define DU_PORT "8787"
-#define SPLIT73_CU 1
-#define SPLIT73_DU 2
-extern int split73;
-
-#define MTU 65536
-#define UDP_TIMEOUT 900000L // in micro  second (struct timeval, NOT struct timespec)
-// linux may timeout for a much longer time (up to 10ms)
-#define blockAlign 32 //bytes to align memory for SIMD copy (256 bits vectors)
-
-// FS6 transport configuration and handler
-typedef struct {
-  char *sourceIP;
-  char *sourcePort;
-  char *destIP;
-  char *destPort;
-  struct addrinfo *destAddr;
-  int sockHandler;
-} UDPsock_t;
-
-#define CTsentCUv0 0xA500
-#define CTsentDUv0 0x5A00
-
-// Main FS6 transport layer header
-// All packets starts with this header
-typedef struct commonUDP_s {
-  uint64_t timestamp; // id of the group (subframe for LTE)
-  uint16_t nbBlocks;       // total number of blocks for this timestamp
-  uint16_t blockID;        // id: 0..nbBocks-1
-  uint16_t contentType;    // defines the content format
-  uint16_t contentBytes;   // will be sent in a UDP packet, so must be < 2^16 bytes
-  uint64_t senderClock;
-} commonUDP_t;
-
-// FS6 UL common header (DU to CU)
-// gives the RACH detection data and is always sent to inform the CU that a subframe arrived
-typedef struct {
-  uint16_t max_preamble[4];
-  uint16_t max_preamble_energy[4];
-  uint16_t max_preamble_delay[4];
-  uint16_t avg_preamble_energy[4];
-} fs6_ul_t;
-
-// FS6 DL common header (CU to DU)
-// gives the DCI configuration from each subframe
-typedef struct {
-  uint8_t pbch_pdu[4];
-  int num_pdcch_symbols;
-  int num_dci;
-  DCI_ALLOC_t dci_alloc[8];
-  int num_mdci;
-  int amp;
-  LTE_eNB_PHICH phich_vars;
-  uint64_t DuClock;
-  uint64_t CuSpentMicroSec;
-} fs6_dl_t;
-
-// a value to type all sub packets,
-// to detect errors, and to be able to extend to other versions
-// the first byte of each sub structure should match one of these values
-enum pckType {
-  fs6UlConfig=25,
-  fs6DlConfig=26,
-  fs6ULConfigCCH=27,
-  fs6ULsch=28,
-  fs6ULcch=29,
-  fs6ULindicationHarq=40,
-  fs6ULindicationSr=41,
-};
-
-// CU to DU definition of a future UL subframe decode
-// defines a UE future data plane
-typedef struct {
-  enum pckType type:8;
-  uint16_t UE_id;
-  int8_t harq_pid;
-  UE_type_t ue_type;
-
-  uint8_t dci_alloc;
-  uint8_t rar_alloc;
-  SCH_status_t status;
-  uint8_t Msg3_flag;
-  uint8_t subframe;
-  uint32_t frame;
-  uint8_t handled;
-  uint8_t phich_active;
-  uint8_t phich_ACK;
-  uint16_t previous_first_rb;
-  uint32_t B;
-  uint32_t G;
-  UCI_format_t uci_format;
-  uint8_t Or2;
-  uint8_t o_RI[2];
-  uint8_t o_ACK[4];
-  uint8_t O_ACK;
-  uint8_t o_RCC;
-  int16_t q_ACK[MAX_ACK_PAYLOAD];
-  int16_t q_RI[MAX_RI_PAYLOAD];
-  uint32_t RTC[MAX_NUM_ULSCH_SEGMENTS];
-  uint8_t ndi;
-  uint8_t round;
-  uint8_t rvidx;
-  uint8_t Nl;
-  uint8_t n_DMRS;
-  uint8_t previous_n_DMRS;
-  uint8_t n_DMRS2;
-  int32_t delta_TF;
-  uint32_t repetition_number ;
-  uint32_t total_number_of_repetitions;
-
-  uint16_t harq_mask;
-  uint16_t nb_rb;
-  uint8_t Qm;
-  uint16_t first_rb;
-  uint8_t O_RI;
-  uint8_t Or1;
-  uint16_t Msc_initial;
-  uint8_t Nsymb_initial;
-  uint8_t V_UL_DAI;
-  uint8_t srs_active;
-  uint32_t TBS;
-  uint8_t Nsymb_pusch;
-  uint8_t Mlimit;
-  uint8_t max_turbo_iterations;
-  uint8_t bundling;
-  uint16_t beta_offset_cqi_times8;
-  uint16_t beta_offset_ri_times8;
-  uint16_t beta_offset_harqack_times8;
-  uint8_t Msg3_active;
-  uint16_t rnti;
-  uint8_t cyclicShift;
-  uint8_t cooperation_flag;
-  uint8_t num_active_cba_groups;
-  uint16_t cba_rnti[4];//NUM_MAX_CBA_GROUP];
-} fs6_dl_ulsched_t;
-
-// CU to DU defintion of a DL packet for a given UE
-// The data itself is padded at the end of this structure
-typedef struct {
-  enum pckType type:8;
-  int UE_id;
-  int8_t harq_pid;
-  uint16_t rnti;
-  int16_t sqrt_rho_a;
-  int16_t sqrt_rho_b;
-  CEmode_t CEmode:8;
-  uint16_t nb_rb;
-  uint8_t Qm;
-  int8_t Nl;
-  uint8_t pdsch_start;
-  uint8_t sib1_br_flag;
-  uint16_t i0;
-  uint32_t rb_alloc[4];
-  int dataLen;
-} fs6_dl_uespec_t;
-
-// CU to DU definition of CCH channel
-typedef struct {
-  int16_t UE_id;
-  LTE_eNB_UCI cch_vars;
-} fs6_dl_uespec_ulcch_element_t;
-
-// header to group all UE CCH channels definitions in one UDP packet
-typedef struct {
-  enum pckType type:8;
-  int16_t nb_active_ue;
-} fs6_dl_uespec_ulcch_t;
-
-// code internal, not transmitted as this
-typedef struct {
-  int ta;
-}  ul_propagation_t;
-
-// One UE UL data, data plane, UE data appended after the header
-typedef struct {
-  enum pckType type:8;
-  short UE_id;
-  uint8_t harq_id;
-  uint8_t segment;
-  int segLen;
-  int r_offset;
-  int G;
-  int ulsch_power[2];
-  uint8_t o_ACK[4];
-  uint8_t O_ACK;
-  int ta;
-  uint8_t o[MAX_CQI_BYTES];
-  uint8_t cqi_crc_status;
-} fs6_ul_uespec_t;
-
-// UL UCI (control plane), per UE
-typedef struct {
-  enum pckType type:8;
-  int UEid;
-  int frame;
-  int subframe;
-  LTE_eNB_UCI uci;
-  uint8_t harq_ack[4];
-  uint8_t tdd_mapping_mode;
-  uint16_t tdd_multiplexing_mask;
-  unsigned short n0_subband_power_dB;
-  uint16_t rnti;
-  int32_t stat;
-} fs6_ul_uespec_uci_element_t;
-
-// all segments UCI grouped in one UDP packet
-typedef struct {
-  enum pckType type:8;
-  int16_t nb_active_ue;
-}  fs6_ul_uespec_uci_t;
-
-
-bool createUDPsock (char *sourceIP, char *sourcePort, char *destIP, char *destPort, UDPsock_t *result);
-int receiveSubFrame(UDPsock_t *sock, void *bufferZone,  int bufferSize, uint16_t contentType);
-int sendSubFrame(UDPsock_t *sock, void *bufferZone, ssize_t secondHeaderSize, uint16_t contentType);
-
-#define initBufferZone(xBuf) \
-  uint8_t xBuf[FS6_BUF_SIZE];   \
-  ((commonUDP_t *)xBuf)->nbBlocks=0;
-
-#define hUDP(xBuf) ((commonUDP_t *)xBuf)
-#define hDL(xBuf)  ((fs6_dl_t*)(((commonUDP_t *)xBuf)+1))
-#define hUL(xBuf)  ((fs6_ul_t*)(((commonUDP_t *)xBuf)+1))
-#define hDLUE(xBuf) ((fs6_dl_uespec_t*) (((fs6_dl_t*)(((commonUDP_t *)xBuf)+1))+1))
-#define hTxULUE(xBuf) ((fs6_dl_ulsched_t*) (((fs6_dl_t*)(((commonUDP_t *)xBuf)+1))+1))
-#define hTxULcch(xBuf) ((fs6_dl_uespec_ulcch_t*) (((fs6_dl_t*)(((commonUDP_t *)xBuf)+1))+1))
-#define hULUE(xBuf) ((fs6_ul_uespec_t*) (((fs6_ul_t*)(((commonUDP_t *)xBuf)+1))+1))
-#define hULUEuci(xBuf) ((fs6_ul_uespec_uci_t*) (((fs6_ul_t*)(((commonUDP_t *)xBuf)+1))+1))
-
-static inline size_t alignedSize(uint8_t *ptr) {
-  commonUDP_t *header=(commonUDP_t *) ptr;
-  return ((header->contentBytes+sizeof(commonUDP_t)+blockAlign-1)/blockAlign)*blockAlign;
-}
-
-static inline void *commonUDPdata(uint8_t *ptr) {
-  return (void *) (((commonUDP_t *)ptr)+1);
-}
-
-void setAllfromTS(uint64_t TS, L1_rxtx_proc_t *proc);
-void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB,LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask,
-                   uint16_t rnti,  int32_t stat);
-void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset);
-void *cu_fs6(void *arg);
-void *du_fs6(void *arg);
-void fill_rf_config(RU_t *ru, char *rf_config_file);
-int init_rf(RU_t *ru);
-void rx_rf(RU_t *ru, L1_rxtx_proc_t *proc);
-void tx_rf(RU_t *ru, L1_rxtx_proc_t *proc);
-void common_signal_procedures (PHY_VARS_eNB *eNB,int frame, int subframe);
-void pmch_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, int fembms_flag);
-bool dlsch_procedures(PHY_VARS_eNB *eNB,
-                      L1_rxtx_proc_t *proc,
-                      int harq_pid,
-                      LTE_eNB_DLSCH_t *dlsch,
-                      LTE_eNB_UE_stats *ue_stats) ;
-void postDecode(L1_rxtx_proc_t *proc, notifiedFIFO_elt_t *req);
-void pdsch_procedures(PHY_VARS_eNB *eNB,
-                      L1_rxtx_proc_t *proc,
-                      int harq_pid,
-                      LTE_eNB_DLSCH_t *dlsch,
-                      LTE_eNB_DLSCH_t *dlsch1);
-void srs_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc);
-void uci_procedures(PHY_VARS_eNB *eNB,
-                    L1_rxtx_proc_t *proc);
-void ocp_rx_prach(PHY_VARS_eNB *eNB,
-		  L1_rxtx_proc_t *proc,
-		  RU_t *ru,
-		  uint16_t *max_preamble,
-		  uint16_t *max_preamble_energy,
-		  uint16_t *max_preamble_delay,
-		  uint16_t *avg_preamble_energy,
-		  uint16_t Nf,
-		  uint8_t tdd_mapindex,
-		  uint8_t br_flag);
-void rx_prach0(PHY_VARS_eNB *eNB,
-               RU_t *ru,
-	       int frame_prach,
-	       int subframe,
-               uint16_t *max_preamble,
-               uint16_t *max_preamble_energy,
-               uint16_t *max_preamble_delay,
-               uint16_t *avg_preamble_energy,
-               uint16_t Nf,
-               uint8_t tdd_mapindex,
-               uint8_t br_flag,
-               uint8_t ce_level
-	       );
-void ocp_tx_rf(RU_t *ru, L1_rxtx_proc_t *proc);
-
-// mistakes in main OAI
-void  phy_init_RU(RU_t *);
-void fep_full(RU_t *ru, int subframe);
-void feptx_prec(RU_t *ru,int frame,int subframe);
-void feptx_ofdm(RU_t *ru, int frame, int subframe);
-void oai_subframe_ind(uint16_t sfn, uint16_t sf);
-void softmodem_printresources(int sig, telnet_printfunc_t pf);
-extern uint16_t sf_ahead;
-#endif
diff --git a/executables/transport_split.c b/executables/transport_split.c
deleted file mode 100644
index 6a21e90a6f..0000000000
--- a/executables/transport_split.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The OpenAirInterface Software Alliance licenses this file to You under
-* the OAI Public License, Version 1.1  (the "License"); you may not use this file
-* except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.openairinterface.org/?page_id=698
-*
-* Author and copyright: Laurent Thomas, open-cells.com
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*-------------------------------------------------------------------------------
-* For more information about the OpenAirInterface (OAI) Software Alliance:
-*      contact@openairinterface.org
-*/
-
-
-
-#include <executables/split_headers.h>
-#include <sys/types.h>          /* See NOTES */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/udp.h>
-#include <netdb.h>
-#include "executables/lte-softmodem.h"
-
-bool createUDPsock (char *sourceIP, char *sourcePort, char *destIP, char *destPort, UDPsock_t *result) {
-  struct addrinfo hints= {0}, *servinfo, *p;
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_DGRAM;
-  hints.ai_flags = AI_PASSIVE;
-  int status;
-
-  if ((status = getaddrinfo(sourceIP, sourcePort, &hints, &servinfo)) != 0) {
-    LOG_E(GTPU,"getaddrinfo error: %s\n", gai_strerror(status));
-    return false;
-  }
-
-  // loop through all the results and bind to the first we can
-  for(p = servinfo; p != NULL; p = p->ai_next) {
-    if ((result->sockHandler = socket(p->ai_family, p->ai_socktype,
-                                      p->ai_protocol)) == -1) {
-      LOG_W(GTPU,"socket: %s\n", strerror(errno));
-      continue;
-    }
-
-    if (bind(result->sockHandler, p->ai_addr, p->ai_addrlen) == -1) {
-      close(result->sockHandler);
-      LOG_W(GTPU,"bind: %s\n", strerror(errno));
-      continue;
-    }
-
-    break; // if we get here, we must have connected successfully
-  }
-
-  if (p == NULL) {
-    // looped off the end of the list with no successful bind
-    LOG_E(GTPU,"failed to bind socket: %s %s \n",sourceIP,sourcePort);
-    return false;
-  }
-
-  freeaddrinfo(servinfo); // all done with this structure
-
-  if ((status = getaddrinfo(destIP, destPort, &hints, &servinfo)) != 0) {
-    LOG_E(GTPU,"getaddrinfo error: %s\n", gai_strerror(status));
-    return false;
-  }
-
-  if (servinfo) {
-    result->destAddr=servinfo;
-  } else {
-    LOG_E(PHY,"No valid UDP addr: %s:%s\n",destIP, destPort);
-    return false;
-  }
-
-  int enable=1;
-  AssertFatal(setsockopt(result->sockHandler, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable))==0,"");
-  struct timeval tv= {0,UDP_TIMEOUT};
-
-  if (IS_SOFTMODEM_RFSIM)
-    tv.tv_sec=2; //debug: wait 2 seconds for human understanding
-
-  AssertFatal(setsockopt(result->sockHandler, SOL_SOCKET, SO_RCVTIMEO,&tv,sizeof(tv)) ==0,"");
-  // Make a send/recv buffer larger than a a couple of subframe
-  // so the kernel will store for us in and out paquets
-  int buff=1000*1000*10;
-  AssertFatal ( setsockopt(result->sockHandler, SOL_SOCKET, SO_SNDBUF, &buff, sizeof(buff)) == 0, "");
-  AssertFatal ( setsockopt(result->sockHandler, SOL_SOCKET, SO_RCVBUF, &buff, sizeof(buff)) == 0, "");
-  return true;
-}
-
-// sock: udp socket
-// bufferZone: a reception area of bufferSize
-int receiveSubFrame(UDPsock_t *sock, void *bufferZone,  int bufferSize, uint16_t contentType) {
-  int rcved=0;
-  commonUDP_t *bufOrigin=(commonUDP_t *)bufferZone;
-  static uint8_t crossData[65536];
-  static int crossDataSize=0;
-
-  if (crossDataSize) {
-    LOG_D(HW,"copy a block received in previous subframe\n");
-    memcpy(bufferZone, crossData, crossDataSize);
-    rcved=1;
-    bufferZone+=crossDataSize;
-    crossDataSize=0;
-  }
-
-  do {
-    //read all subframe data from the control unit
-    int ret=recv(sock->sockHandler, bufferZone, bufferSize, 0);
-
-    if ( ret==-1) {
-      if ( errno == EWOULDBLOCK || errno== EINTR ) {
-        LOG_I(HW,"Received: Timeout, subframe incomplete\n");
-        return  rcved;
-      } else {
-        LOG_E(HW,"Critical issue in socket: %s\n", strerror(errno));
-        return -1;
-      }
-    } else {
-      if (hUDP(bufferZone)->contentType != contentType)
-        abort();
-
-      if (rcved && bufOrigin->timestamp != hUDP(bufferZone)->timestamp ) {
-        if ( hUDP(bufferZone)->timestamp > bufOrigin->timestamp ) {
-          LOG_W(HW,"Received data for TS: %lu before end of TS : %lu completion\n",
-                hUDP(bufferZone)->timestamp,
-                bufOrigin->timestamp);
-          memcpy(crossData, bufferZone, ret );
-          crossDataSize=ret;
-          return rcved;
-        } else {
-          LOG_W(HW,"Dropping late packet\n");
-          continue;
-        }
-      }
-
-      rcved++;
-      bufferZone+=ret;
-    }
-
-    LOG_D(HW,"Received: blocks: %d/%d, size %d, TS: %lu\n",
-          rcved, bufOrigin->nbBlocks, ret, bufOrigin->timestamp);
-  } while ( rcved == 0 || rcved < bufOrigin->nbBlocks );
-
-  return rcved;
-}
-
-int sendSubFrame(UDPsock_t *sock, void *bufferZone, ssize_t secondHeaderSize, uint16_t contentType) {
-  commonUDP_t *UDPheader=(commonUDP_t *)bufferZone ;
-  UDPheader->contentType=contentType;
-  UDPheader->senderClock=rdtsc_oai();
-  int nbBlocks=UDPheader->nbBlocks;
-  int blockId=0;
-
-  if (nbBlocks <= 0 ) {
-    LOG_E(PHY,"FS6: can't send blocks: %d\n", nbBlocks);
-    return 0;
-  }
-
-  do {
-    if (blockId > 0 ) {
-      commonUDP_t *currentHeader=(commonUDP_t *)bufferZone;
-      currentHeader->timestamp=UDPheader->timestamp;
-      currentHeader->nbBlocks=UDPheader->nbBlocks;
-      currentHeader->blockID=blockId;
-      currentHeader->contentType=UDPheader->contentType;
-      memcpy(commonUDPdata((void *)currentHeader), commonUDPdata(bufferZone), secondHeaderSize);
-    }
-
-    blockId++;
-    int sz=alignedSize(bufferZone);
-    // Let's use the first address returned by getaddrinfo()
-    int ret=sendto(sock->sockHandler, bufferZone, sz, 0,
-                   sock->destAddr->ai_addr, sock->destAddr->ai_addrlen);
-
-    if ( ret != sz )
-      LOG_W(HW,"Wrote socket doesn't return size %d (val: %d, errno:%d, %s)\n",
-            sz, ret, errno, strerror(errno));
-
-    LOG_D(HW,"Sent: TS: %lu, blocks %d/%d, block size : %d \n",
-          UDPheader->timestamp, UDPheader->nbBlocks-nbBlocks, UDPheader->nbBlocks, sz);
-    bufferZone+=sz;
-    nbBlocks--;
-  } while (nbBlocks);
-
-  return 0;
-}
diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
index 79af311e45..4591e8e0a7 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
@@ -300,6 +300,7 @@ void nr_sort_asc_int16_1D_array_ind(int32_t *matrix,
 
 void nr_free_double_2D_array(double **input, uint16_t xlen);
 
+#ifndef __cplusplus
 void updateLLR(uint8_t listSize,
 	       uint16_t row,
 	       uint16_t col,
@@ -327,7 +328,7 @@ void updatePathMetric2(double *pathMetric,
 		       int ylen,
 		       int zlen,
 		       double llr[xlen][ylen][zlen]);
-
+#endif
 //Also nr_polar_rate_matcher
 static inline void nr_polar_interleaver(uint8_t *input,
                                         uint8_t *output,
diff --git a/openair1/PHY/LTE_TRANSPORT/prach.c b/openair1/PHY/LTE_TRANSPORT/prach.c
index 6a989edc4d..ed4ca98049 100644
--- a/openair1/PHY/LTE_TRANSPORT/prach.c
+++ b/openair1/PHY/LTE_TRANSPORT/prach.c
@@ -39,7 +39,6 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "prach_extern.h"
 #include <openair1/PHY/LTE_TRANSPORT/transport_proto.h>
-#include <executables/split_headers.h>
 #include "common/utils/lte/prach_utils.h"
 
 void rx_prach0(PHY_VARS_eNB *eNB,
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
index ebfdceefc3..e358ee3a58 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
@@ -41,7 +41,6 @@
 #include "RRC/LTE/rrc_extern.h"
 #include "PHY_INTERFACE/phy_interface.h"
 #include "transport_proto.h"
-#include <executables/split_headers.h>
 
 extern int oai_exit;
 
@@ -321,12 +320,6 @@ int ulsch_decoding_data(PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc,
     else
       E = ulsch_harq->Qm * ((GpmodC==0?0:1) + (Gp/ulsch_harq->C));
     
-    if ( split73 == SPLIT73_DU ) {
-      sendFs6Ul(eNB, UE_id, harq_pid, r, ulsch_harq->eUL+r_offset, E*sizeof(int16_t), r_offset);
-      r_offset += E;
-      continue;
-    }
-
     union turboReqUnion id= {.s={ulsch->rnti,proc->frame_rx,proc->subframe_rx,0,0}};
     notifiedFIFO_elt_t *req=newNotifiedFIFO_elt(sizeof(turboDecode_t),
                                                 id.p,
diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c b/openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
index 5545f5c4bd..eaa1f5be7b 100644
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
@@ -141,8 +141,8 @@ void nr_ue_measurements(PHY_VARS_NR_UE *ue,
   for (gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++) {
 
     ue->measurements.rx_power_avg_dB[gNB_id] = dB_fixed( ue->measurements.rx_power_avg[gNB_id]);
-    ue->measurements.wideband_cqi_tot[gNB_id] = dB_fixed2(ue->measurements.rx_power_tot[gNB_id], ue->measurements.n0_power_tot);
-    ue->measurements.wideband_cqi_avg[gNB_id] = dB_fixed2(ue->measurements.rx_power_avg[gNB_id], ue->measurements.n0_power_avg);
+    ue->measurements.wideband_cqi_tot[gNB_id] = ue->measurements.rx_power_tot_dB[gNB_id] - ue->measurements.n0_power_tot_dB;
+    ue->measurements.wideband_cqi_avg[gNB_id] = ue->measurements.rx_power_avg_dB[gNB_id] - dB_fixed(ue->measurements.n0_power_avg);
     ue->measurements.rx_rssi_dBm[gNB_id] = ue->measurements.rx_power_avg_dB[gNB_id] + 30 - 10*log10(pow(2, 30)) - ((int)openair0_cfg[0].rx_gain[0] - (int)openair0_cfg[0].rx_gain_offset[0]) - dB_fixed(ue->frame_parms.ofdm_symbol_size);
 
     LOG_D(PHY, "[gNB %d] Slot %d, RSSI %d dB (%d dBm/RE), WBandCQI %d dB, rxPwrAvg %d, n0PwrAvg %d\n",
@@ -185,9 +185,6 @@ void nr_ue_ssb_rsrp_measurements(PHY_VARS_NR_UE *ue,
 
   uint8_t l_sss = (symbol_offset + 2) % ue->frame_parms.symbols_per_slot;
 
-  if (ssb_offset>= ue->frame_parms.ofdm_symbol_size)
-    ssb_offset -= ue->frame_parms.ofdm_symbol_size;
-
   uint32_t rsrp = 0;
 
   LOG_D(PHY, "In %s: [UE %d] slot %d l_sss %d ssb_offset %d\n", __FUNCTION__, ue->Mod_id, slot, l_sss, ssb_offset);
@@ -195,15 +192,17 @@ void nr_ue_ssb_rsrp_measurements(PHY_VARS_NR_UE *ue,
 
   for (int aarx = 0; aarx < ue->frame_parms.nb_antennas_rx; aarx++) {
 
-    int16_t *rxF_sss = (int16_t *)&rxdataF[aarx][(l_sss*ue->frame_parms.ofdm_symbol_size) + ssb_offset];
+    int16_t *rxF_sss = (int16_t *)&rxdataF[aarx][l_sss*ue->frame_parms.ofdm_symbol_size];
 
     for(int k = k_start; k < k_end; k++){
 
+      int re = (ssb_offset + k) % ue->frame_parms.ofdm_symbol_size;
+
 #ifdef DEBUG_MEAS_UE
-      LOG_I(PHY, "In %s rxF_sss %d %d\n", __FUNCTION__, rxF_sss[k*2], rxF_sss[k*2 + 1]);
+      LOG_I(PHY, "In %s rxF_sss %d %d\n", __FUNCTION__, rxF_sss[re*2], rxF_sss[re*2 + 1]);
 #endif
 
-      rsrp += (((int32_t)rxF_sss[k*2]*rxF_sss[k*2]) + ((int32_t)rxF_sss[k*2 + 1]*rxF_sss[k*2 + 1]));
+      rsrp += (((int32_t)rxF_sss[re*2]*rxF_sss[re*2]) + ((int32_t)rxF_sss[re*2 + 1]*rxF_sss[re*2 + 1]));
       nb_re++;
 
     }
@@ -232,11 +231,11 @@ void nr_ue_rrc_measurements(PHY_VARS_NR_UE *ue,
 
   uint8_t k;
   int slot = proc->nr_slot_rx;
-  int aarx, nb_nulls;
+  int aarx;
   int16_t *rxF_sss;
-  uint8_t k_left = 48;
-  uint8_t k_right = 183;
-  uint8_t k_length = 8;
+  const uint8_t k_left = 48;
+  const uint8_t k_right = 183;
+  const uint8_t k_length = 8;
   uint8_t l_sss = (ue->symbol_offset + 2) % ue->frame_parms.symbols_per_slot;
   unsigned int ssb_offset = ue->frame_parms.first_carrier_offset + ue->frame_parms.ssb_start_subcarrier;
   double rx_gain = openair0_cfg[0].rx_gain[0];
@@ -248,41 +247,42 @@ void nr_ue_rrc_measurements(PHY_VARS_NR_UE *ue,
 
   for (aarx = 0; aarx<ue->frame_parms.nb_antennas_rx; aarx++) {
 
-    nb_nulls = 0;
     ue->measurements.n0_power[aarx] = 0;
-    rxF_sss = (int16_t *)&rxdataF[aarx][(l_sss*ue->frame_parms.ofdm_symbol_size) + ssb_offset];
+    rxF_sss = (int16_t *)&rxdataF[aarx][l_sss*ue->frame_parms.ofdm_symbol_size];
 
     //-ve spectrum from SSS
     for(k = k_left; k < k_left + k_length; k++){
 
+      int re = (ssb_offset + k) % ue->frame_parms.ofdm_symbol_size;
+
       #ifdef DEBUG_MEAS_RRC
-      LOG_I(PHY, "In %s -rxF_sss %d %d\n", __FUNCTION__, rxF_sss[k*2], rxF_sss[k*2 + 1]);
+      LOG_I(PHY, "In %s -rxF_sss %d %d\n", __FUNCTION__, rxF_sss[re*2], rxF_sss[re*2 + 1]);
       #endif
 
-      ue->measurements.n0_power[aarx] += (((int32_t)rxF_sss[k*2]*rxF_sss[k*2]) + ((int32_t)rxF_sss[k*2 + 1]*rxF_sss[k*2 + 1]));
-      nb_nulls++;
+      ue->measurements.n0_power[aarx] += (((int32_t)rxF_sss[re*2]*rxF_sss[re*2]) + ((int32_t)rxF_sss[re*2 + 1]*rxF_sss[re*2 + 1]));
 
     }
 
     //+ve spectrum from SSS
     for(k = k_right; k < k_right + k_length; k++){
 
+      int re = (ssb_offset + k) % ue->frame_parms.ofdm_symbol_size;
+
       #ifdef DEBUG_MEAS_RRC
-      LOG_I(PHY, "In %s +rxF_sss %d %d\n", __FUNCTION__, rxF_sss[k*2], rxF_sss[k*2 + 1]);
+      LOG_I(PHY, "In %s +rxF_sss %d %d\n", __FUNCTION__, rxF_sss[re*2], rxF_sss[re*2 + 1]);
       #endif
 
-      ue->measurements.n0_power[aarx] += (((int32_t)rxF_sss[k*2]*rxF_sss[k*2]) + ((int32_t)rxF_sss[k*2 + 1]*rxF_sss[k*2 + 1]));
-      nb_nulls++;
+      ue->measurements.n0_power[aarx] += (((int32_t)rxF_sss[re*2]*rxF_sss[re*2]) + ((int32_t)rxF_sss[re*2 + 1]*rxF_sss[re*2 + 1]));
 
     }
 
-    ue->measurements.n0_power[aarx] /= nb_nulls;
+    ue->measurements.n0_power[aarx] /= 2*k_length;
     ue->measurements.n0_power_dB[aarx] = (unsigned short) dB_fixed(ue->measurements.n0_power[aarx]);
     ue->measurements.n0_power_tot += ue->measurements.n0_power[aarx];
 
   }
 
-  ue->measurements.n0_power_tot_dB = (unsigned short) dB_fixed(ue->measurements.n0_power_tot/aarx);
+  ue->measurements.n0_power_tot_dB = (unsigned short) dB_fixed(ue->measurements.n0_power_tot);
 
   #ifdef DEBUG_MEAS_RRC
   const int psd_awgn = -174;
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
index a5760d7fc0..db6a15213c 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -44,6 +44,7 @@
 #include "executables/nr-uesoftmodem.h"
 #include "PHY/CODING/nrLDPC_extern.h"
 #include "common/utils/nr/nr_common.h"
+#include "openair1/PHY/TOOLS/phy_scope_interface.h"
 
 //#define ENABLE_PHY_PAYLOAD_DEBUG 1
 
@@ -53,10 +54,16 @@
 static uint64_t nb_total_decod =0;
 static uint64_t nb_error_decod =0;
 
+static extended_kpi_ue kpiStructure = {0};
+
 notifiedFIFO_t freeBlocks_dl;
 notifiedFIFO_elt_t *msgToPush_dl;
 int nbDlProcessing =0;
 
+extended_kpi_ue* getKPIUE(void) {
+  return &kpiStructure;
+}
+
 void nr_ue_dlsch_init(NR_UE_DLSCH_t *dlsch_list, int num_dlsch, uint8_t max_ldpc_iterations) {
   for (int i=0; i < num_dlsch; i++) {
     NR_UE_DLSCH_t *dlsch = dlsch_list + i;
@@ -99,6 +106,11 @@ bool nr_ue_postDecode(PHY_VARS_NR_UE *phy_vars_ue, notifiedFIFO_elt_t *req, bool
 
   // if all segments are done
   if (last) {
+    kpiStructure.nb_total++;
+    kpiStructure.blockSize = dlsch->dlsch_config.TBS;
+    kpiStructure.dl_mcs = dlsch->dlsch_config.mcs;
+    kpiStructure.nofRBs = dlsch->dlsch_config.number_rbs;
+
     if (decodeSuccess) {
       //LOG_D(PHY,"[UE %d] DLSCH: Setting ACK for nr_slot_rx %d TBS %d mcs %d nb_rb %d harq_process->round %d\n",
       //      phy_vars_ue->Mod_id,nr_slot_rx,harq_process->TBS,harq_process->mcs,harq_process->nb_rb, harq_process->round);
@@ -114,6 +126,7 @@ bool nr_ue_postDecode(PHY_VARS_NR_UE *phy_vars_ue, notifiedFIFO_elt_t *req, bool
       dlsch->last_iteration_cnt = rdata->decodeIterations;
       LOG_D(PHY, "DLSCH received ok \n");
     } else {
+      kpiStructure.nb_nack++;
       //LOG_D(PHY,"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d, mcs %d) Kr %d r %d harq_process->round %d\n",
       //      phy_vars_ue->Mod_id, frame, nr_slot_rx, harq_pid,harq_process->status, harq_process->round,harq_process->TBS,harq_process->mcs,Kr,r,harq_process->round);
       harq_process->ack = 0;
diff --git a/openair1/PHY/TOOLS/Makefile b/openair1/PHY/TOOLS/Makefile
index c5fd0d87f7..da87365809 100644
--- a/openair1/PHY/TOOLS/Makefile
+++ b/openair1/PHY/TOOLS/Makefile
@@ -2,14 +2,14 @@ oai_dfts_sse4: oai_dfts.c
 	gcc -O3 -std=gnu99 -msse4.1 -o oai_dfts_sse4 oai_dfts.c time_meas.c  ../../SIMULATION/TOOLS/taus.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
 
 oai_dfts_avx2: oai_dfts.c
-	gcc -O2 -std=gnu99 -mavx2 -g -ggdb -o oai_dfts_avx2 oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
+	gcc -O2 -std=gnu99 -mavx2 -g -ggdb -o oai_dfts_avx2 oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
 
 oai_dfts_avx2.s: oai_dfts.c
-	gcc -O2 -std=gnu99 -mavx2 -S oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
+	gcc -O2 -std=gnu99 -mavx2 -S oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
 
 
 oai_dfts_sse4.s: oai_dfts.c
-	gcc -O2 -std=gnu99 -msse4.1 -S oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
+	gcc -O2 -std=gnu99 -msse4.1 -S oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
 
 
 dft_cycles_avx2: oai_dfts_avx2
diff --git a/openair1/PHY/TOOLS/nr_phy_qt_scope.cpp b/openair1/PHY/TOOLS/nr_phy_qt_scope.cpp
new file mode 100644
index 0000000000..04e42873ea
--- /dev/null
+++ b/openair1/PHY/TOOLS/nr_phy_qt_scope.cpp
@@ -0,0 +1,1165 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Authors and copyright: Bo Zhao, Marwan Hammouda, Thomas Schlichter (Fraunhofer IIS)
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include <QApplication>
+#include <QtWidgets>
+#include <QPainter>
+#include <QtGui>
+#include <QLineEdit>
+#include <QFormLayout>
+#include <QtCharts>
+#include <QValueAxis>
+
+#include <iostream>
+#include <cassert>
+#include <cmath>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "nr_phy_qt_scope.h"
+
+extern "C" {
+#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
+#include <openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h>
+}
+
+#define ScaleZone 4;
+#define SquaredNorm(VaR) ((VaR).r * (VaR).r + (VaR).i * (VaR).i)
+
+/*
+@gNB: These are the (default) lower and upper threshold values for BLER and Throughput at the gNB side.
+These threshold values can be further updated in run-time through the option 'Configs' in the drop-down list.
+*/
+float Limits_KPI_gNB[4][2] = {
+    // {lower Limit, Upper Limit}
+    {0.0, 0.8}, // UL BLER
+    {0.2, 10}, // UL Throughput in Mbs
+    {0.0, 0.8}, // DL BLER
+    {0.2, 10} // DL Throughput in Mbs
+};
+
+/*
+@UE: These are the (default) lower and upper threshold values for BLER and Throughput at the UE side.
+These threshold values can be further updated in run-time through the option 'Configs' in the drop-down list
+*/
+float Limits_KPI_ue[2][2] = {
+    // {lower Limit, Upper Limit}
+    {0.0, 0.8}, // DL BLER
+    {0.2, 10} // Throughput in Mbs
+};
+
+/* This class creates the window when choosing the option 'Configs' to configure the threshold values. */
+ConfigBoxFloat::ConfigBoxFloat(float *valuePtr, QWidget *parent) : QLineEdit(parent), valuePtr(valuePtr)
+{
+  this->setText(QString::number(*valuePtr));
+  connect(this, &ConfigBoxFloat::editingFinished, this, &ConfigBoxFloat::readText);
+}
+
+/* This function reads the input config values, entered by user, and update the Limits_KPI_* accordignly. */
+void ConfigBoxFloat::readText()
+{
+  QString text_e1 = this->text();
+  *this->valuePtr = text_e1.toFloat();
+}
+
+/* @gNB: create configuration window */
+KPIConfigGnb::KPIConfigGnb(QWidget *parent) : QWidget(parent)
+{
+  this->resize(300, 300);
+  this->setWindowTitle("gNB Configs");
+
+  ConfigBoxFloat *configItem1 = new ConfigBoxFloat(&Limits_KPI_gNB[0][0]);
+  ConfigBoxFloat *configItem2 = new ConfigBoxFloat(&Limits_KPI_gNB[0][1]);
+  ConfigBoxFloat *configItem3 = new ConfigBoxFloat(&Limits_KPI_gNB[1][0]);
+  ConfigBoxFloat *configItem4 = new ConfigBoxFloat(&Limits_KPI_gNB[1][1]);
+  ConfigBoxFloat *configItem5 = new ConfigBoxFloat(&Limits_KPI_gNB[2][0]);
+  ConfigBoxFloat *configItem6 = new ConfigBoxFloat(&Limits_KPI_gNB[2][1]);
+  ConfigBoxFloat *configItem7 = new ConfigBoxFloat(&Limits_KPI_gNB[3][0]);
+  ConfigBoxFloat *configItem8 = new ConfigBoxFloat(&Limits_KPI_gNB[3][1]);
+
+  QFormLayout *flo = new QFormLayout(this);
+  flo->addRow("U-BLER lower", configItem1);
+  flo->addRow("U-BLER upper", configItem2);
+  flo->addRow("U-Throughput lower[Mbs]", configItem3);
+  flo->addRow("U-Throughput upper[Mbs]", configItem4);
+  flo->addRow("D-BLER lower", configItem5);
+  flo->addRow("D-BLER upper", configItem6);
+  flo->addRow("D-Throughput lower[Mbs]", configItem7);
+  flo->addRow("D-Throughput upper[Mbs]", configItem8);
+}
+
+/* @UE: create configuration window */
+KPIConfigUE::KPIConfigUE(QWidget *parent) : QWidget(parent)
+{
+  this->resize(300, 300);
+  this->setWindowTitle("UE Configs");
+
+  ConfigBoxFloat *configItem1 = new ConfigBoxFloat(&Limits_KPI_ue[0][0]);
+  ConfigBoxFloat *configItem2 = new ConfigBoxFloat(&Limits_KPI_ue[0][1]);
+  ConfigBoxFloat *configItem3 = new ConfigBoxFloat(&Limits_KPI_ue[1][0]);
+  ConfigBoxFloat *configItem4 = new ConfigBoxFloat(&Limits_KPI_ue[1][1]);
+
+  QFormLayout *flo = new QFormLayout(this);
+  flo->addRow("BLER lower", configItem1);
+  flo->addRow("BLER upper", configItem2);
+  flo->addRow("Throughput lower[Mbs]", configItem3);
+  flo->addRow("Throughput upper[Mbs]", configItem4);
+}
+
+/* @gNB: This class creates the drop-down list at the gNB side. Each item correspinds to an implemented KPI. */
+KPIListSelectGnb::KPIListSelectGnb(QWidget *parent) : QComboBox(parent)
+{
+  this->addItem("- empty -", static_cast<int>(PlotTypeGnb::empty));
+  this->addItem("RX Signal-Time", static_cast<int>(PlotTypeGnb::waterFall));
+  this->addItem("Channel Response", static_cast<int>(PlotTypeGnb::CIR));
+
+  this->addItem("LLR PUSCH", static_cast<int>(PlotTypeGnb::puschLLR));
+  this->addItem("I/Q PUSCH", static_cast<int>(PlotTypeGnb::puschIQ));
+  this->addItem("UL SNR", static_cast<int>(PlotTypeGnb::puschSNR));
+  this->addItem("UL BLER", static_cast<int>(PlotTypeGnb::puschBLER));
+  this->addItem("UL MCS", static_cast<int>(PlotTypeGnb::puschMCS));
+  this->addItem("UL Retrans.", static_cast<int>(PlotTypeGnb::puschRETX));
+  this->addItem("UL Throughput", static_cast<int>(PlotTypeGnb::puschThroughput));
+
+  this->addItem("DL SNR (CQI)", static_cast<int>(PlotTypeGnb::pdschSNR));
+  this->addItem("DL BLER", static_cast<int>(PlotTypeGnb::pdschBLER));
+  this->addItem("DL MCS", static_cast<int>(PlotTypeGnb::pdschMCS));
+  this->addItem("DL Retrans.", static_cast<int>(PlotTypeGnb::pdschRETX));
+  this->addItem("DL Throughput", static_cast<int>(PlotTypeGnb::pdschThroughput));
+  this->addItem("Nof Sched. RBs", static_cast<int>(PlotTypeGnb::pdschRBs));
+
+  this->addItem("Configs", static_cast<int>(PlotTypeGnb::config));
+}
+
+/* @UE: This class creates the drop-down list at the UE side. Each item correspinds to an implemented KPI. */
+KPIListSelectUE::KPIListSelectUE(QWidget *parent) : QComboBox(parent)
+{
+  this->addItem("- empty -", static_cast<int>(PlotTypeUE::empty));
+  this->addItem("RX Signal-Time", static_cast<int>(PlotTypeUE::waterFall));
+  this->addItem("Channel Response", static_cast<int>(PlotTypeUE::CIR));
+
+  this->addItem("LLR PBCH", static_cast<int>(PlotTypeUE::pbchLLR));
+  this->addItem("I/Q PBCH", static_cast<int>(PlotTypeUE::pbchIQ));
+  this->addItem("LLR PDCCH", static_cast<int>(PlotTypeUE::pdcchLLR));
+  this->addItem("I/Q PDCCH", static_cast<int>(PlotTypeUE::pdcchIQ));
+  this->addItem("LLR PDSCH", static_cast<int>(PlotTypeUE::pdschLLR));
+  this->addItem("I/Q PDSCH", static_cast<int>(PlotTypeUE::pdschIQ));
+
+  this->addItem("DL SNR", static_cast<int>(PlotTypeUE::pdschSNR));
+  this->addItem("DL BLER", static_cast<int>(PlotTypeUE::pdschBLER));
+  this->addItem("DL MCS", static_cast<int>(PlotTypeUE::pdschMCS));
+  this->addItem("Throughput", static_cast<int>(PlotTypeUE::pdschThroughput));
+  this->addItem("Nof Sched. RBs", static_cast<int>(PlotTypeUE::pdschRBs));
+  this->addItem("Freq. Offset", static_cast<int>(PlotTypeUE::frequencyOffset));
+  this->addItem("Time Adv.", static_cast<int>(PlotTypeUE::timingAdvance));
+
+  this->addItem("Configs", static_cast<int>(PlotTypeUE::config));
+}
+
+WaterFall::WaterFall(complex16 *values, NR_DL_FRAME_PARMS *frame_parms, QWidget *parent) : QWidget(parent), values(values), frame_parms(frame_parms)
+{
+  this->iteration = 0;
+  this->image = nullptr;
+  this->waterFallAvg = nullptr;
+
+  startTimer(100);
+}
+
+/* this function to plot the waterfall graph for the RX signal in time domain for one frame. x-axis shows the frame divided into slots
+   and the y-axis is a color map depending on the SquaredNorm of the received signal at the correspoinding slot. */
+void WaterFall::timerEvent(QTimerEvent *event)
+{
+  if (!this->isVisible())
+    return;
+
+  const int datasize = frame_parms->samples_per_frame;
+  const int samplesPerPixel = datasize / this->width();
+  const int displayPart = this->height() - ScaleZone;
+
+  if (!this->image) {
+    this->image = new QImage(this->width(), this->height(), QImage::Format_RGB32);
+    this->image->fill(QColor(240, 240, 240));
+    this->iteration = 0;
+    this->waterFallAvg = (double *)realloc(this->waterFallAvg, this->height() * sizeof(double));
+    memset(this->waterFallAvg, 0, this->height() * sizeof(double));
+
+    // Plot vertical Lines
+    QRgb *pixels = (QRgb *)this->image->bits();
+    for (int slot = 1; slot < frame_parms->slots_per_frame; slot++) {
+      int lineX = frame_parms->get_samples_slot_timestamp(slot, frame_parms, 0) / samplesPerPixel;
+      for (int row = displayPart; row < this->height(); row++)
+        pixels[row * this->width() + lineX] = 0xFF000000; // black
+    }
+    this->update();
+  }
+
+  QRgb *pixels = (QRgb *)this->image->bits();
+
+  double avg = 0;
+  for (int i = 0; i < displayPart; i++)
+    avg += this->waterFallAvg[i];
+  avg /= displayPart;
+
+  const int row = this->iteration % displayPart;
+
+  this->waterFallAvg[row] = 0;
+  for (int pix = 0; pix < this->width(); pix++) {
+    complex16 *end = values + (pix + 1) * samplesPerPixel;
+    end -= 2;
+
+    double val = 0;
+    for (complex16 *s = values + pix * samplesPerPixel; s < end; s++)
+      val += SquaredNorm(*s);
+    val /= samplesPerPixel;
+    this->waterFallAvg[row] += val;
+
+    QRgb col;
+    if (val > avg * 100)
+      col = 0xFFFF0000; // red
+    else if (val > avg * 10)
+      col = 0xFFFFFF00; // yellow
+    else if (val > avg)
+      col = 0xFF00FF00; // green
+    else
+      col = 0xFF0000FF; // blue
+    pixels[row * this->width() + pix] = col;
+  }
+  this->waterFallAvg[row] /= this->width();
+
+  this->iteration++;
+  this->update(0, row, this->width(), 1);
+}
+
+void WaterFall::paintEvent(QPaintEvent *event)
+{
+  if (!this->image)
+    return;
+
+  QPainter painter(this);
+  painter.drawImage(event->rect(), *this->image, event->rect()); // paint image on widget
+}
+
+void WaterFall::resizeEvent(QResizeEvent *event)
+{
+  if (this->image) {
+    delete this->image;
+    this->image = nullptr;
+  }
+}
+
+CIRPlot::CIRPlot(complex16 *data, int len) : data(data), len(len)
+{
+  this->legend()->hide();
+
+  // add new series to the chart
+  this->series = new QLineSeries();
+  this->series->setColor(Qt::blue);
+  this->addSeries(series);
+
+  // add new X axis
+  this->axisX = new QValueAxis();
+  this->axisX->setLabelFormat("%d");
+  this->axisX->setRange(-len / 2, len / 2);
+  this->addAxis(this->axisX, Qt::AlignBottom);
+  this->series->attachAxis(this->axisX);
+
+  // add new Y axis
+  this->axisY = new QValueAxis();
+  this->axisY->setLabelFormat("%.1e");
+  this->addAxis(this->axisY, Qt::AlignLeft);
+  this->series->attachAxis(this->axisY);
+
+  startTimer(1000);
+}
+
+void CIRPlot::timerEvent(QTimerEvent *event)
+{
+  if (!this->isVisible())
+    return;
+
+  QVector<QPointF> points(this->len);
+  float maxY = this->axisY->max();
+
+  for (int i = 0; i < this->len / 2; i++) {
+    float value = SquaredNorm(this->data[i + this->len / 2]);
+    points[i] = QPointF(i - this->len / 2, value);
+    maxY = std::max(maxY, value);
+  }
+  for (int i = 0; i < this->len / 2; i++) {
+    float value = SquaredNorm(this->data[i]);
+    points[i + this->len / 2] = QPointF(i, value);
+    maxY = std::max(maxY, value);
+  }
+
+  this->axisY->setMax(maxY);
+  this->series->replace(points);
+}
+
+LLRPlot::LLRPlot(int16_t *data, int len) : data(data), len(len)
+{
+  this->legend()->hide();
+
+  // add new series to the chart
+  this->series = new QScatterSeries();
+  this->series->setMarkerSize(3);
+  this->series->setMarkerShape(QScatterSeries::MarkerShapeRectangle);
+  this->series->setColor(Qt::blue);
+  this->series->setPen(Qt::NoPen);
+  this->addSeries(series);
+
+  // add new X axis
+  this->axisX = new QValueAxis();
+  this->axisX->setLabelFormat("%d");
+  this->axisX->setRange(0, len);
+  this->addAxis(this->axisX, Qt::AlignBottom);
+  this->series->attachAxis(this->axisX);
+
+  // add new Y axis
+  this->axisY = new QValueAxis();
+  this->addAxis(this->axisY, Qt::AlignLeft);
+  this->series->attachAxis(this->axisY);
+
+  startTimer(1000);
+}
+
+void LLRPlot::timerEvent(QTimerEvent *event)
+{
+  if (!this->isVisible())
+    return;
+
+  QVector<QPointF> points(this->len);
+  int maxY = this->axisY->max();
+
+  for (int i = 0; i < this->len; i++) {
+    points[i] = QPointF(i, this->data[i]);
+    maxY = std::max(maxY, abs(this->data[i]));
+  }
+
+  this->axisY->setRange(-maxY, maxY);
+  this->series->replace(points);
+}
+
+IQPlot::IQPlot(complex16 *data, int len) : data(data), len(len)
+{
+  this->legend()->hide();
+
+  // add new series to the chart
+  this->series = new QScatterSeries();
+  this->series->setMarkerSize(3);
+  this->series->setMarkerShape(QScatterSeries::MarkerShapeRectangle);
+  this->series->setColor(Qt::blue);
+  this->series->setPen(Qt::NoPen);
+  this->addSeries(series);
+
+  // add new X axis
+  this->axisX = new QValueAxis();
+  this->addAxis(this->axisX, Qt::AlignBottom);
+  this->series->attachAxis(this->axisX);
+
+  // add new Y axis
+  this->axisY = new QValueAxis();
+  this->addAxis(this->axisY, Qt::AlignLeft);
+  this->series->attachAxis(this->axisY);
+
+  startTimer(1000);
+}
+
+void IQPlot::timerEvent(QTimerEvent *event)
+{
+  if (!this->isVisible())
+    return;
+
+  QVector<QPointF> points(this->len);
+  int maxX = this->axisX->max();
+  int maxY = this->axisY->max();
+
+  for (int i = 0; i < this->len; i++) {
+    points[i] = QPointF(this->data[i].r, this->data[i].i);
+
+    maxX = std::max(maxX, abs(this->data[i].r));
+    maxY = std::max(maxY, abs(this->data[i].i));
+  }
+
+  this->axisX->setRange(-maxX, maxX);
+  this->axisY->setRange(-maxY, maxY);
+  this->series->replace(points);
+}
+
+KPIPlot::KPIPlot(ValueProvider *valueProvider, float *limits) : valueProvider(valueProvider), limits(limits)
+{
+  this->series = new QLineSeries();
+  this->series->setColor(Qt::blue);
+  this->addSeries(series);
+
+  this->seriesMin = new QLineSeries();
+  this->seriesMin->setColor(Qt::red);
+  this->addSeries(seriesMin);
+
+  this->seriesMax = new QLineSeries();
+  this->seriesMax->setColor(Qt::red);
+  this->addSeries(seriesMax);
+
+  this->seriesAvg = new QLineSeries();
+  this->seriesAvg->setColor(Qt::green);
+  this->seriesAvg->setName("Average");
+  this->addSeries(seriesAvg);
+
+  if (limits) {
+    this->seriesMin->setName("Upper Limit");
+    this->seriesMax->setName("Lower Limit");
+    this->minValue = limits[0];
+    this->maxValue = limits[1];
+  } else {
+    this->seriesMin->setName("Minimum");
+    this->seriesMax->setName("Maximum");
+    this->minValue = 0;
+    this->maxValue = 0;
+  }
+
+  this->sumValue = 0;
+  this->plotIdx = 0;
+
+  // add new X axis
+  this->axisX = new QValueAxis();
+  this->axisX->setLabelFormat("%d");
+  this->axisX->setRange(0, 300);
+  this->addAxis(this->axisX, Qt::AlignBottom);
+
+  this->series->attachAxis(this->axisX);
+  this->seriesMin->attachAxis(this->axisX);
+  this->seriesMax->attachAxis(this->axisX);
+  this->seriesAvg->attachAxis(this->axisX);
+
+  // add new Y axis
+  this->axisY = new QValueAxis();
+  this->addAxis(this->axisY, Qt::AlignLeft);
+  this->series->attachAxis(this->axisY);
+  this->seriesMin->attachAxis(this->axisY);
+  this->seriesMax->attachAxis(this->axisY);
+  this->seriesAvg->attachAxis(this->axisY);
+
+  startTimer(1000);
+}
+
+void KPIPlot::timerEvent(QTimerEvent *event)
+{
+  if (!this->isVisible())
+    return;
+
+  if (this->plotIdx >= 300) {
+    this->series->clear();
+    this->sumValue = 0;
+    this->plotIdx = 0;
+  }
+
+  float value = this->valueProvider->getValue();
+  this->series->append(this->plotIdx++, value);
+
+  this->minValue = std::min(this->minValue, value);
+  this->maxValue = std::max(this->maxValue, value);
+
+  this->seriesMin->clear();
+  this->seriesMax->clear();
+  this->seriesAvg->clear();
+
+  if (this->limits) {
+    this->seriesMin->append(0, this->limits[0]);
+    this->seriesMin->append(300, this->limits[0]);
+
+    this->seriesMax->append(0, this->limits[1]);
+    this->seriesMax->append(300, this->limits[1]);
+  } else {
+    this->seriesMin->append(0, this->minValue);
+    this->seriesMin->append(300, this->minValue);
+
+    this->seriesMax->append(0, this->maxValue);
+    this->seriesMax->append(300, this->maxValue);
+  }
+
+  this->sumValue += value;
+  float average = this->sumValue / this->plotIdx;
+  this->seriesAvg->append(0, average);
+  this->seriesAvg->append(300, average);
+
+  this->axisY->setRange(this->minValue, this->maxValue);
+}
+
+RTXPlot::RTXPlot(uint64_t *rounds) : rounds(rounds)
+{
+  for (int i = 0; i < 4; i++)
+    this->lastRounds[i] = rounds[i];
+
+  this->maxValue = 0;
+  this->plotIdx = 0;
+
+  this->series[0] = new QLineSeries();
+  this->series[0]->setColor(Qt::blue);
+  this->series[0]->setName("round 1");
+  this->addSeries(this->series[0]);
+
+  this->series[1] = new QLineSeries();
+  this->series[1]->setColor(Qt::green);
+  this->series[1]->setName("round 2");
+  this->addSeries(this->series[1]);
+
+  this->series[2] = new QLineSeries();
+  this->series[2]->setColor(Qt::yellow);
+  this->series[2]->setName("round 3");
+  this->addSeries(this->series[2]);
+
+  this->series[3] = new QLineSeries();
+  this->series[3]->setColor(Qt::red);
+  this->series[3]->setName("round 4");
+  this->addSeries(this->series[3]);
+
+  // add new X axis
+  this->axisX = new QValueAxis();
+  this->axisX->setLabelFormat("%d");
+  this->axisX->setRange(0, 300);
+  this->addAxis(this->axisX, Qt::AlignBottom);
+
+  this->series[0]->attachAxis(this->axisX);
+  this->series[1]->attachAxis(this->axisX);
+  this->series[2]->attachAxis(this->axisX);
+  this->series[3]->attachAxis(this->axisX);
+
+  // add new Y axis
+  this->axisY = new QValueAxis();
+  this->addAxis(this->axisY, Qt::AlignLeft);
+  this->series[0]->attachAxis(this->axisY);
+  this->series[1]->attachAxis(this->axisY);
+  this->series[2]->attachAxis(this->axisY);
+  this->series[3]->attachAxis(this->axisY);
+
+  startTimer(1000);
+}
+
+void RTXPlot::timerEvent(QTimerEvent *event)
+{
+  if (!this->isVisible())
+    return;
+
+  if (this->plotIdx >= 300) {
+    this->series[0]->clear();
+    this->series[1]->clear();
+    this->series[2]->clear();
+    this->series[3]->clear();
+    this->plotIdx = 0;
+  }
+
+  for (int i = 0; i < 4; i++) {
+    int value = this->rounds[i] - this->lastRounds[i];
+    this->lastRounds[i] += value;
+    this->maxValue = std::max(this->maxValue, value);
+    this->series[i]->append(this->plotIdx, value);
+  }
+
+  this->plotIdx++;
+
+  this->axisY->setRange(0, this->maxValue);
+}
+
+/* @gNB: This is the main function of the gNB sub-widgets, i.e., for each KPI. This function will be called
+   only once when the the sub-widget is created, and it mainly initializes the widget variables and structures. */
+PainterWidgetGnb::PainterWidgetGnb(QWidget *config, QComboBox *comboBox, scopeData_t *p) : config(config), comboBox(comboBox), p(p)
+{
+  this->chartView = new QChartView(this);
+  this->chartView->hide();
+
+  this->plotType = PlotTypeGnb::empty;
+
+  makeConnections(this->comboBox->currentIndex());
+  connect(this->comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &PainterWidgetGnb::makeConnections);
+}
+
+float PainterWidgetGnb::getValue()
+{
+  NR_DL_FRAME_PARMS *frame_parms = &this->p->gNB->frame_parms;
+  gNB_MAC_INST *gNBMac = (gNB_MAC_INST *)RC.nrmac[0];
+  NR_UE_info_t *targetUE = gNBMac->UE_info.list[0];
+  NR_UE_sched_ctrl_t *sched_ctrl = &targetUE->UE_sched_ctrl;
+  NR_sched_pdsch_t *sched_pdsch = &sched_ctrl->sched_pdsch;
+
+  switch (this->plotType) {
+    case PlotTypeGnb::puschSNR:
+      return sched_ctrl->pusch_snrx10 / 10.0;
+
+    case PlotTypeGnb::puschBLER:
+      return sched_ctrl->ul_bler_stats.bler;
+
+    case PlotTypeGnb::puschMCS:
+      return sched_ctrl->ul_bler_stats.mcs;
+
+    case PlotTypeGnb::puschThroughput: {
+      double slotDuration = 10.0 / (double)frame_parms->slots_per_frame;
+      double blerTerm = 1.0 - (double)sched_ctrl->ul_bler_stats.bler;
+      double blockSizeBits = (double)(targetUE->mac_stats.ul.current_bytes << 3);
+      double ThrouputKBitSec = blerTerm * blockSizeBits / slotDuration;
+      return (float)(ThrouputKBitSec / 1000); // Throughput in MBit/sec
+    }
+    case PlotTypeGnb::pdschSNR:
+      return sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.wb_cqi_1tb;
+
+    case PlotTypeGnb::pdschBLER:
+      return sched_ctrl->dl_bler_stats.bler;
+
+    case PlotTypeGnb::pdschMCS:
+      return sched_ctrl->dl_bler_stats.mcs;
+
+    case PlotTypeGnb::pdschThroughput: {
+      double slotDuration = 10.0 / (double)frame_parms->slots_per_frame;
+      double blerTerm = 1.0 - (double)sched_ctrl->dl_bler_stats.bler;
+      double blockSizeBits = (double)(targetUE->mac_stats.dl.current_bytes << 3);
+      double ThrouputKBitSec = blerTerm * blockSizeBits / slotDuration;
+      return (float)(ThrouputKBitSec / 1000); // Throughput in MBit/sec
+    }
+    case PlotTypeGnb::pdschRBs:
+      return sched_ctrl->harq_processes[sched_pdsch->dl_harq_pid].sched_pdsch.rbSize;
+
+    default:
+      return 0;
+  }
+}
+
+/* @gNB Class: this function is called when a resize event is detected, then the widget will be adjusted accordignly. */
+void PainterWidgetGnb::resizeEvent(QResizeEvent *event)
+{
+  if (this->waterFall)
+    this->waterFall->resize(event->size());
+  this->chartView->resize(event->size());
+}
+
+/* @gNB: this function is to check which KPI to plot in the current widget based on the drop-down list selection
+   Then the widget will be connected with the correspinding KPI function. */
+void PainterWidgetGnb::makeConnections(int type)
+{
+  const PlotTypeGnb plotType = static_cast<PlotTypeGnb>(type);
+
+  if (plotType == this->plotType)
+    return;
+
+  if (plotType == PlotTypeGnb::config) {
+    config->show();
+    this->comboBox->setCurrentIndex(static_cast<int>(this->plotType));
+    return;
+  }
+
+  this->plotType = plotType;
+  this->chartView->hide();
+  QChart *prevChart = this->chartView->chart();
+
+  if (plotType == PlotTypeGnb::waterFall) {
+    this->chartView->setChart(new QChart);
+    this->waterFall = new WaterFall((complex16 *)this->p->ru->common.rxdata[0], &this->p->gNB->frame_parms, this);
+    this->waterFall->resize(this->size());
+    this->waterFall->show();
+    delete prevChart;
+    return;
+  }
+
+  if (this->waterFall) {
+    this->waterFall->hide();
+    delete this->waterFall;
+    this->waterFall = nullptr;
+  }
+
+  NR_DL_FRAME_PARMS *frame_parms = &this->p->gNB->frame_parms;
+  gNB_MAC_INST *gNBMac = (gNB_MAC_INST *)RC.nrmac[0];
+  NR_UE_info_t *targetUE = gNBMac->UE_info.list[0];
+
+  QChart *newChart = nullptr;
+
+  switch (plotType) {
+    case PlotTypeGnb::empty: {
+      newChart = new QChart();
+      break;
+    }
+    case PlotTypeGnb::CIR: {
+      newChart = new CIRPlot((complex16 *)p->gNB->pusch_vars[0]->ul_ch_estimates_time[0], frame_parms->ofdm_symbol_size);
+      break;
+    }
+
+    case PlotTypeGnb::puschLLR: {
+      int num_re = frame_parms->N_RB_UL * 12 * frame_parms->symbols_per_slot;
+      int Qm = 2;
+      int coded_bits_per_codeword = num_re * Qm;
+      newChart = new LLRPlot((int16_t *)p->gNB->pusch_vars[0]->llr, coded_bits_per_codeword);
+      break;
+    }
+    case PlotTypeGnb::puschIQ: {
+      int num_re = frame_parms->N_RB_UL * 12 * frame_parms->symbols_per_slot;
+      newChart = new IQPlot((complex16 *)p->gNB->pusch_vars[0]->rxdataF_comp[0], num_re);
+      break;
+    }
+    case PlotTypeGnb::puschSNR: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+    case PlotTypeGnb::puschBLER: {
+      newChart = new KPIPlot(this, Limits_KPI_gNB[0]);
+      break;
+    }
+    case PlotTypeGnb::puschMCS: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+    case PlotTypeGnb::puschRETX: {
+      newChart = new RTXPlot(targetUE->mac_stats.ul.rounds);
+      break;
+    }
+    case PlotTypeGnb::puschThroughput: {
+      newChart = new KPIPlot(this, Limits_KPI_gNB[1]);
+      break;
+    }
+
+    case PlotTypeGnb::pdschSNR: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+    case PlotTypeGnb::pdschBLER: {
+      newChart = new KPIPlot(this, Limits_KPI_gNB[2]);
+      break;
+    }
+    case PlotTypeGnb::pdschMCS: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+    case PlotTypeGnb::pdschRETX: {
+      newChart = new RTXPlot(targetUE->mac_stats.dl.rounds);
+      break;
+    }
+    case PlotTypeGnb::pdschThroughput: {
+      newChart = new KPIPlot(this, Limits_KPI_gNB[3]);
+      break;
+    }
+    case PlotTypeGnb::pdschRBs: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+
+    default:
+      break;
+  }
+
+  this->chartView->setChart(newChart);
+  this->chartView->show();
+  delete prevChart;
+}
+
+/* @UE: This is the main function of the UE sub-widgets, i.e., for each KPI. This function will be called
+   only once when the the sub-widget is created, and it mainly initializes the widget variables and structures. */
+PainterWidgetUE::PainterWidgetUE(QWidget *config, QComboBox *comboBox, PHY_VARS_NR_UE *ue) : config(config), comboBox(comboBox), ue(ue)
+{
+  this->chartView = new QChartView(this);
+  this->chartView->hide();
+
+  this->plotType = PlotTypeUE::empty;
+
+  makeConnections(this->comboBox->currentIndex());
+  connect(this->comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &PainterWidgetUE::makeConnections);
+}
+
+float PainterWidgetUE::getValue()
+{
+  NR_DL_FRAME_PARMS *frame_parms = &this->ue->frame_parms;
+
+  switch (this->plotType) {
+    case PlotTypeUE::pdschSNR:
+      return (float)this->ue->measurements.wideband_cqi_avg[0];
+
+    case PlotTypeUE::pdschBLER: {
+      if (getKPIUE()->nb_total == 0)
+        return 0;
+      return (float)getKPIUE()->nb_nack / (float)getKPIUE()->nb_total;
+    }
+    case PlotTypeUE::pdschMCS:
+      return (float)getKPIUE()->dl_mcs;
+
+    case PlotTypeUE::pdschThroughput: {
+      if (getKPIUE()->nb_total == 0)
+        return 0;
+      double slotDuration = 10.0 / (double)frame_parms->slots_per_frame;
+      double blerTerm = 1.0 - (double)(getKPIUE()->nb_nack) / (double)getKPIUE()->nb_total;
+      double blockSizeBits = (double)getKPIUE()->blockSize;
+      double ThrouputKBitSec = blerTerm * blockSizeBits / slotDuration;
+      return (float)(ThrouputKBitSec / 1000); // Throughput in MBit/sec
+    }
+    case PlotTypeUE::pdschRBs:
+      return (float)getKPIUE()->nofRBs;
+
+    case PlotTypeUE::frequencyOffset:
+      return (float)this->ue->common_vars.freq_offset;
+
+    case PlotTypeUE::timingAdvance:
+      return (float)this->ue->timing_advance;
+
+    default:
+      return 0;
+  }
+}
+
+/* @UE Class: this function is called when a resize event is detected, then the widget will be adjusted accordignly. */
+void PainterWidgetUE::resizeEvent(QResizeEvent *event)
+{
+  if (this->waterFall)
+    this->waterFall->resize(event->size());
+  this->chartView->resize(event->size());
+}
+
+/* @UE: this function is to check which KPI to plot in the current widget based on the drop-down list selection.
+   Then the widget will be connected with the correspinding KPI function. */
+void PainterWidgetUE::makeConnections(int type)
+{
+  const PlotTypeUE plotType = static_cast<PlotTypeUE>(type);
+
+  if (plotType == this->plotType)
+    return;
+
+  if (plotType == PlotTypeUE::config) {
+    config->show();
+    this->comboBox->setCurrentIndex(static_cast<int>(this->plotType));
+    return;
+  }
+
+  this->plotType = plotType;
+  this->chartView->hide();
+  QChart *prevChart = this->chartView->chart();
+
+  if (plotType == PlotTypeUE::waterFall) {
+    this->chartView->setChart(new QChart);
+    this->waterFall = new WaterFall((complex16 *)this->ue->common_vars.rxdata[0], &this->ue->frame_parms, this);
+    this->waterFall->resize(this->size());
+    this->waterFall->show();
+    delete prevChart;
+    return;
+  }
+
+  if (this->waterFall) {
+    this->waterFall->hide();
+    delete this->waterFall;
+    this->waterFall = nullptr;
+  }
+
+  scopeData_t *scope = (scopeData_t *)this->ue->scopeData;
+  scopeGraphData_t **data = (scopeGraphData_t **)scope->liveData;
+
+  QChart *newChart = nullptr;
+
+  switch (plotType) {
+    case PlotTypeUE::empty: {
+      newChart = new QChart();
+      break;
+    }
+    case PlotTypeUE::CIR: {
+      if (!data[pbchDlChEstimateTime]) {
+        newChart = new QChart();
+        this->plotType = PlotTypeUE::empty;
+        this->comboBox->setCurrentIndex(static_cast<int>(PlotTypeUE::empty));
+        break;
+      }
+      newChart = new CIRPlot((complex16 *)(data[pbchDlChEstimateTime] + 1), data[pbchDlChEstimateTime]->lineSz);
+      break;
+    }
+
+    case PlotTypeUE::pbchLLR: {
+      if (!data[pbchLlr]) {
+        newChart = new QChart();
+        this->plotType = PlotTypeUE::empty;
+        this->comboBox->setCurrentIndex(static_cast<int>(PlotTypeUE::empty));
+        break;
+      }
+      newChart = new LLRPlot((int16_t *)(data[pbchLlr] + 1), data[pbchLlr]->lineSz);
+      break;
+    }
+    case PlotTypeUE::pbchIQ: {
+      if (!data[pbchRxdataF_comp]) {
+        newChart = new QChart();
+        this->plotType = PlotTypeUE::empty;
+        this->comboBox->setCurrentIndex(static_cast<int>(PlotTypeUE::empty));
+        break;
+      }
+      newChart = new IQPlot((complex16 *)(data[pbchRxdataF_comp] + 1), data[pbchRxdataF_comp]->lineSz);
+      break;
+    }
+    case PlotTypeUE::pdcchLLR: {
+      if (!data[pdcchLlr]) {
+        newChart = new QChart();
+        this->plotType = PlotTypeUE::empty;
+        this->comboBox->setCurrentIndex(static_cast<int>(PlotTypeUE::empty));
+        break;
+      }
+      newChart = new LLRPlot((int16_t *)(data[pdcchLlr] + 1), data[pdcchLlr]->lineSz);
+      break;
+    }
+    case PlotTypeUE::pdcchIQ: {
+      if (!data[pdcchRxdataF_comp]) {
+        newChart = new QChart();
+        this->plotType = PlotTypeUE::empty;
+        this->comboBox->setCurrentIndex(static_cast<int>(PlotTypeUE::empty));
+        break;
+      }
+      newChart = new IQPlot((complex16 *)(data[pdcchRxdataF_comp] + 1), data[pdcchRxdataF_comp]->lineSz);
+      break;
+    }
+    case PlotTypeUE::pdschLLR: {
+      if (!data[pdschLlr]) {
+        newChart = new QChart();
+        this->plotType = PlotTypeUE::empty;
+        this->comboBox->setCurrentIndex(static_cast<int>(PlotTypeUE::empty));
+        break;
+      }
+      newChart = new LLRPlot((int16_t *)(data[pdschLlr] + 1), data[pdschLlr]->lineSz);
+      break;
+    }
+    case PlotTypeUE::pdschIQ: {
+      if (!data[pdschRxdataF_comp]) {
+        newChart = new QChart();
+        this->plotType = PlotTypeUE::empty;
+        this->comboBox->setCurrentIndex(static_cast<int>(PlotTypeUE::empty));
+        break;
+      }
+      newChart = new IQPlot((complex16 *)(data[pdschRxdataF_comp] + 1), data[pdschRxdataF_comp]->lineSz);
+      break;
+    }
+
+    case PlotTypeUE::pdschSNR: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+    case PlotTypeUE::pdschBLER: {
+      newChart = new KPIPlot(this, Limits_KPI_ue[0]);
+      break;
+    }
+    case PlotTypeUE::pdschMCS: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+    case PlotTypeUE::pdschThroughput: {
+      newChart = new KPIPlot(this, Limits_KPI_ue[1]);
+      break;
+    }
+    case PlotTypeUE::pdschRBs: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+    case PlotTypeUE::frequencyOffset: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+    case PlotTypeUE::timingAdvance: {
+      newChart = new KPIPlot(this);
+      break;
+    }
+
+    default:
+      break;
+  }
+
+  this->chartView->setChart(newChart);
+  this->chartView->show();
+  delete prevChart;
+}
+
+// main thread of gNB
+void *nrgNBQtscopeThread(void *arg)
+{
+  scopeData_t *p = (scopeData_t *)arg;
+
+  sleep(3);
+
+  int argc = 1;
+  char *argv[] = {(char *)"nrqt_scopegNB"};
+  QApplication a(argc, argv);
+
+  // Create a main window (widget)
+  QWidget window;
+  window.resize(800, 800);
+  window.setWindowTitle("gNB Scope");
+
+  // Create gNB configuration window
+  KPIConfigGnb config;
+
+  // Main layout
+  QGridLayout mainLayout(&window);
+
+  KPIListSelectGnb combo1;
+  combo1.setCurrentIndex(static_cast<int>(PlotTypeGnb::waterFall));
+  PainterWidgetGnb pwidgetGnbCombo1(&config, &combo1, p);
+
+  mainLayout.addWidget(&combo1, 0, 0);
+  mainLayout.addWidget(&pwidgetGnbCombo1, 1, 0);
+
+  KPIListSelectGnb combo2;
+  combo2.setCurrentIndex(static_cast<int>(PlotTypeGnb::CIR));
+  PainterWidgetGnb pwidgetGnbCombo2(&config, &combo2, p);
+
+  mainLayout.addWidget(&combo2, 0, 1);
+  mainLayout.addWidget(&pwidgetGnbCombo2, 1, 1);
+
+  KPIListSelectGnb combo3;
+  combo3.setCurrentIndex(static_cast<int>(PlotTypeGnb::puschLLR));
+  PainterWidgetGnb pwidgetGnbCombo3(&config, &combo3, p);
+
+  mainLayout.addWidget(&combo3, 2, 0);
+  mainLayout.addWidget(&pwidgetGnbCombo3, 3, 0);
+
+  KPIListSelectGnb combo4;
+  combo4.setCurrentIndex(static_cast<int>(PlotTypeGnb::puschIQ));
+  PainterWidgetGnb pwidgetGnbCombo4(&config, &combo4, p);
+
+  mainLayout.addWidget(&combo4, 2, 1);
+  mainLayout.addWidget(&pwidgetGnbCombo4, 3, 1);
+
+  KPIListSelectGnb combo5;
+  combo5.setCurrentIndex(static_cast<int>(PlotTypeGnb::empty));
+  PainterWidgetGnb pwidgetGnbCombo5(&config, &combo5, p);
+
+  mainLayout.addWidget(&combo5, 4, 0);
+  mainLayout.addWidget(&pwidgetGnbCombo5, 5, 0);
+
+  KPIListSelectGnb combo6;
+  combo6.setCurrentIndex(static_cast<int>(PlotTypeGnb::empty));
+  PainterWidgetGnb pwidgetGnbCombo6(&config, &combo6, p);
+
+  mainLayout.addWidget(&combo6, 4, 1);
+  mainLayout.addWidget(&pwidgetGnbCombo6, 5, 1);
+
+  // display the main window
+  window.show();
+  a.exec();
+
+  return nullptr;
+}
+
+// main thread of UE
+void *nrUEQtscopeThread(void *arg)
+{
+  PHY_VARS_NR_UE *ue = (PHY_VARS_NR_UE *)arg;
+
+  sleep(1);
+
+  int argc = 1;
+  char *argv[] = {(char *)"nrqt_scopeUE"};
+  QApplication a(argc, argv);
+
+  // Create a main window (widget)
+  QWidget window;
+  window.resize(800, 800);
+  window.setWindowTitle("UE Scope");
+
+  // Create UE configuration window
+  KPIConfigUE config;
+
+  // Main layout
+  QGridLayout mainLayout(&window);
+
+  KPIListSelectUE combo1;
+  combo1.setCurrentIndex(static_cast<int>(PlotTypeUE::waterFall));
+  PainterWidgetUE pwidgetueCombo1(&config, &combo1, ue);
+
+  mainLayout.addWidget(&combo1, 0, 0);
+  mainLayout.addWidget(&pwidgetueCombo1, 1, 0);
+
+  KPIListSelectUE combo2;
+  combo2.setCurrentIndex(static_cast<int>(PlotTypeUE::CIR));
+  PainterWidgetUE pwidgetueCombo2(&config, &combo2, ue);
+
+  mainLayout.addWidget(&combo2, 0, 1);
+  mainLayout.addWidget(&pwidgetueCombo2, 1, 1);
+
+  KPIListSelectUE combo3;
+  combo3.setCurrentIndex(static_cast<int>(PlotTypeUE::pbchLLR));
+  PainterWidgetUE pwidgetueCombo3(&config, &combo3, ue);
+
+  mainLayout.addWidget(&combo3, 2, 0);
+  mainLayout.addWidget(&pwidgetueCombo3, 3, 0);
+
+  KPIListSelectUE combo4;
+  combo4.setCurrentIndex(static_cast<int>(PlotTypeUE::pbchIQ));
+  PainterWidgetUE pwidgetueCombo4(&config, &combo4, ue);
+
+  mainLayout.addWidget(&combo4, 2, 1);
+  mainLayout.addWidget(&pwidgetueCombo4, 3, 1);
+
+  KPIListSelectUE combo5;
+  combo5.setCurrentIndex(static_cast<int>(PlotTypeUE::pdschLLR));
+  PainterWidgetUE pwidgetueCombo5(&config, &combo5, ue);
+
+  mainLayout.addWidget(&combo5, 4, 0);
+  mainLayout.addWidget(&pwidgetueCombo5, 5, 0);
+
+  KPIListSelectUE combo6;
+  combo6.setCurrentIndex(static_cast<int>(PlotTypeUE::pdschIQ));
+  PainterWidgetUE pwidgetueCombo6(&config, &combo6, ue);
+
+  mainLayout.addWidget(&combo6, 4, 1);
+  mainLayout.addWidget(&pwidgetueCombo6, 5, 1);
+
+  // display the main window
+  window.show();
+  a.exec();
+
+  return nullptr;
+}
+
+// gNB scope initialization
+void nrgNBinitQtScope(scopeParms_t *p)
+{
+  scopeData_t *scope = (scopeData_t *)malloc(sizeof(scopeData_t));
+
+  scope->gNB = p->gNB;
+  scope->argc = p->argc;
+  scope->argv = p->argv;
+  scope->ru = p->ru;
+
+  p->gNB->scopeData = scope;
+
+  pthread_t qtscope_thread;
+  threadCreate(&qtscope_thread, nrgNBQtscopeThread, scope, (char *)"qtscope", -1, sched_get_priority_min(SCHED_RR));
+}
+
+// UE scope initialization
+void nrUEinitQtScope(PHY_VARS_NR_UE *ue)
+{
+  scopeData_t *scope = (scopeData_t *)malloc(sizeof(scopeData_t));
+
+  scope->liveData = calloc(sizeof(scopeGraphData_t *), UEdataTypeNumberOfItems);
+  scope->copyData = UEcopyData;
+
+  ue->scopeData = scope;
+
+  pthread_t qtscope_thread;
+  threadCreate(&qtscope_thread, nrUEQtscopeThread, ue, (char *)"qtscope", -1, sched_get_priority_min(SCHED_RR));
+}
+
+extern "C" void nrqtscope_autoinit(void *dataptr)
+{
+  AssertFatal((IS_SOFTMODEM_GNB_BIT || IS_SOFTMODEM_5GUE_BIT), "Scope cannot find NRUE or GNB context");
+
+  if (IS_SOFTMODEM_GNB_BIT)
+    nrgNBinitQtScope((scopeParms_t *)dataptr);
+  else
+    nrUEinitQtScope((PHY_VARS_NR_UE *)dataptr);
+}
diff --git a/openair1/PHY/TOOLS/nr_phy_qt_scope.h b/openair1/PHY/TOOLS/nr_phy_qt_scope.h
new file mode 100644
index 0000000000..f10fef9d61
--- /dev/null
+++ b/openair1/PHY/TOOLS/nr_phy_qt_scope.h
@@ -0,0 +1,468 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Authors and copyright: Bo Zhao, Marwan Hammouda, Thomas Schlichter (Fraunhofer IIS)
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#ifndef QT_SCOPE_MAINWINDOW_H
+#define QT_SCOPE_MAINWINDOW_H
+
+#include <QtCharts>
+
+extern "C" {
+#include <simple_executable.h>
+#include <common/utils/system.h>
+#include "common/ran_context.h"
+#include <openair1/PHY/defs_gNB.h>
+#include "PHY/defs_gNB.h"
+#include "PHY/defs_nr_UE.h"
+#include "PHY/defs_RU.h"
+#include "executables/softmodem-common.h"
+#include "phy_scope_interface.h"
+#include <openair2/LAYER2/NR_MAC_gNB/mac_proto.h>
+#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
+
+extern RAN_CONTEXT_t RC;
+}
+
+/// This is an enum class for the different gNB plot types
+enum class PlotTypeGnb {
+  empty,
+  waterFall,
+  CIR,
+  puschLLR,
+  puschIQ,
+  puschSNR,
+  puschBLER,
+  puschMCS,
+  puschRETX,
+  puschThroughput,
+  pdschSNR,
+  pdschBLER,
+  pdschMCS,
+  pdschRETX,
+  pdschThroughput,
+  pdschRBs,
+  config
+};
+
+/// This is an enum class fpr the different UE plot types
+enum class PlotTypeUE {
+  empty,
+  waterFall,
+  CIR,
+  pbchLLR,
+  pbchIQ,
+  pdcchLLR,
+  pdcchIQ,
+  pdschLLR,
+  pdschIQ,
+  pdschSNR,
+  pdschBLER,
+  pdschMCS,
+  pdschThroughput,
+  pdschRBs,
+  frequencyOffset,
+  timingAdvance,
+  config
+};
+
+/// This abstract class defines an interface how the KPIPlot class can access values for the different KPI plot types
+class ValueProvider {
+ public:
+  /// This pure virtual function is meant to provide the KPI value to be plotted
+  virtual float getValue() = 0;
+};
+
+/// An editable GUI field for a dialog box to set certain KPI configurations
+class ConfigBoxFloat : public QLineEdit {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param valuePtr Pointer to a float value, which can be edited through this ConfigBoxFloat
+  /// \param parent Optional pointer to parent QWidget
+  ConfigBoxFloat(float *valuePtr, QWidget *parent = nullptr);
+
+ public slots:
+  /// This function converts the value in the editable GUI field to float and writes it back to valuePtr
+  void readText();
+
+ private:
+  /// Member variable keeping the pointer to the float value
+  float *valuePtr;
+};
+
+/// Dialog box for configuring gNB KPI Limits
+class KPIConfigGnb : public QWidget {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param parent Optional pointer to parent QWidget
+  explicit KPIConfigGnb(QWidget *parent = nullptr);
+};
+
+/// Dialog box for configuring UE KPI Limits
+class KPIConfigUE : public QWidget {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param parent Optional pointer to parent QWidget
+  explicit KPIConfigUE(QWidget *parent = nullptr);
+};
+
+/// drop-down list gNB
+class KPIListSelectGnb : public QComboBox {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param parent Optional pointer to parent QWidget
+  explicit KPIListSelectGnb(QWidget *parent = nullptr);
+};
+
+/// drop-down list UE
+class KPIListSelectUE : public QComboBox {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param parent Optional pointer to parent QWidget
+  explicit KPIListSelectUE(QWidget *parent = nullptr);
+};
+
+/// Waterfall plot of RX signal power
+class WaterFall : public QWidget {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param values Pointer to the digital I/Q samples
+  /// \param frame_parms Pointer to the NR_DL_FRAME_PARMS
+  /// \param parent Optional pointer to parent QWidget
+  WaterFall(complex16 *values, NR_DL_FRAME_PARMS *frame_parms, QWidget *parent = nullptr);
+
+ protected:
+  /// This function is triggered when the own timer expires. It reads data from values and updates the image
+  /// \param event Pointer to the timer event
+  virtual void timerEvent(QTimerEvent *event) override;
+
+  /// This function is used to draw the image on the GUI
+  /// \param event Pointer to the paint event
+  virtual void paintEvent(QPaintEvent *event) override;
+
+  /// This function is called to change the WaterFall size
+  /// \param event Pointer to the resize event
+  virtual void resizeEvent(QResizeEvent *event) override;
+
+ private:
+  /// Pointer to the digital I/Q samples
+  complex16 *values;
+
+  /// Pointer to the NR_DL_FRAME_PARMS
+  NR_DL_FRAME_PARMS *frame_parms;
+
+  /// Pointer to the image
+  QImage *image;
+
+  /// Counter of the drawn lines
+  int iteration;
+
+  /// pointer to an array storing per-row average power values
+  double *waterFallAvg;
+};
+
+/// Chart class for plotting the Channel Impulse Response
+class CIRPlot : public QChart {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param data Pointer to the CIR data
+  /// \param len Length of the CIR data
+  CIRPlot(complex16 *data, int len);
+
+ protected:
+  /// This function is triggered when the own timer expires. It updates the plotted CIR
+  /// \param event Pointer to the timer event
+  virtual void timerEvent(QTimerEvent *event) override;
+
+ private:
+  /// Pointer to the CIR data
+  complex16 *data;
+
+  /// Length of the CIR data
+  int len;
+
+  /// Line series used to plot the CIR in the chart
+  QLineSeries *series;
+
+  /// Horizontal axis of the chart
+  QValueAxis *axisX;
+
+  /// Vertical axis of the chart
+  QValueAxis *axisY;
+};
+
+/// Chart class for plotting LLRs
+class LLRPlot : public QChart {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param data Pointer to the LLR data
+  /// \param len Length of the LLR data
+  LLRPlot(int16_t *data, int len);
+
+ protected:
+  /// This function is triggered when the own timer expires. It updates the plotted LLR
+  /// \param event Pointer to the timer event
+  virtual void timerEvent(QTimerEvent *event) override;
+
+ private:
+  /// Pointer to the LLR data
+  int16_t *data;
+
+  /// Length of the LLR data
+  int len;
+
+  /// Scatter series used to plot the LLR in the chart
+  QScatterSeries *series;
+
+  /// Horizontal axis of the chart
+  QValueAxis *axisX;
+
+  /// Vertical axis of the chart
+  QValueAxis *axisY;
+};
+
+/// Chart class for plotting the I/Q constellation diagram
+class IQPlot : public QChart {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param data Pointer to the complex I/Q data
+  /// \param len Length of the I/Q data
+  IQPlot(complex16 *data, int len);
+
+ protected:
+  /// This function is triggered when the own timer expires. It updates the plotted I/Q constellation diagram
+  /// \param event Pointer to the timer event
+  virtual void timerEvent(QTimerEvent *event) override;
+
+ private:
+  /// Pointer to the I/Q data
+  complex16 *data;
+
+  /// Length of the I/Q data
+  int len;
+
+  /// Scatter series used to plot the I/Q constellation diagram
+  QScatterSeries *series;
+
+  /// Horizontal axis of the chart
+  QValueAxis *axisX;
+
+  /// Vertical axis of the chart
+  QValueAxis *axisY;
+};
+
+/// Generic class for plotting KPI values with min., max. and average bars
+class KPIPlot : public QChart {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param valueProvider Pointer to an instance of a class that implements the ValueProvider interface
+  /// \param limits Optional parameter pointing to an array of two floating point values indicating lower and upper bounds
+  KPIPlot(ValueProvider *valueProvider, float *limits = nullptr);
+
+ protected:
+  /// This function is triggered when the own timer expires. It updates the plotted KPI chart
+  /// \param event Pointer to the timer event
+  virtual void timerEvent(QTimerEvent *event) override;
+
+ private:
+  /// Pointer to an instance of a class that implements the ValueProvider interface
+  ValueProvider *valueProvider;
+
+  /// Pointer to an array of two floating point values indicating lower and upper bounds
+  float *limits;
+
+  /// smallest observed KPI value
+  float minValue;
+
+  /// biggest observed KPI value
+  float maxValue;
+
+  /// Accumulated KPI valus, used to compute the average
+  float sumValue;
+
+  /// Index (horizontal position) of the last plotted KPI value
+  int plotIdx;
+
+  /// Line series used to plot the KPI values
+  QLineSeries *series;
+
+  /// Line series used to plot an indication of the smallest observed KPI value
+  QLineSeries *seriesMin;
+
+  /// Line series used to plot an indication of the biggest observed KPI value
+  QLineSeries *seriesMax;
+
+  /// Line series used to plot an indication of the average KPI value
+  QLineSeries *seriesAvg;
+
+  /// Horizontal axis of the chart
+  QValueAxis *axisX;
+
+  /// Vertical axis of the chart
+  QValueAxis *axisY;
+};
+
+/// Crart class for plotting HARQ retransmission counters
+class RTXPlot : public QChart {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param rounds Pointer to the HARQ round counters
+  RTXPlot(uint64_t *rounds);
+
+ protected:
+  /// This function is triggered when the own timer expires. It updates the plotted HARQ retransmission counters
+  /// \param event Pointer to the timer event
+  virtual void timerEvent(QTimerEvent *event) override;
+
+ private:
+  /// Pointer to the HARQ round counters
+  uint64_t *rounds;
+
+  /// Last stored HARQ round counters
+  uint64_t lastRounds[4];
+
+  /// Maximum observed HARQ retransmissions
+  int maxValue;
+
+  /// Index (horizontal position) of the last plotted HARQ retransmission value
+  int plotIdx;
+
+  /// Line series used to plot the four HARQ retransmission counters
+  QLineSeries *series[4];
+
+  /// Horizontal axis of the chart
+  QValueAxis *axisX;
+
+  /// Vertical axis of the chart
+  QValueAxis *axisY;
+};
+
+/// Widget showing one selectable gNB KPI
+class PainterWidgetGnb : public QWidget, public ValueProvider {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param config Pointer to the dialog box for configuring gNB KPI Limits
+  /// \param comboBox Pointer to the drop-down list selecting the KPI to be shown here
+  /// \param p Pointer to the gNB parameters
+  PainterWidgetGnb(QWidget *config, QComboBox *comboBox, scopeData_t *p);
+
+  /// This function provides the current KPI value to be plotted
+  virtual float getValue() override;
+
+ protected:
+  /// This function is called to change the widget size
+  /// \param event Pointer to the resize event
+  virtual void resizeEvent(QResizeEvent *event) override;
+
+ public slots:
+  /// This function is called when a different KPI is selected
+  /// \param type selected KPI type
+  void makeConnections(int type);
+
+ private:
+  /// Pointer to the dialog box for configuring gNB KPI Limits
+  QWidget *config;
+
+  /// Pointer to the drop-down list selecting the KPI to be shown here
+  QComboBox *comboBox;
+
+  /// Pointer to the gNB parameters
+  scopeData_t *p;
+
+  /// Pointer to a class to view all QChart based KPIs
+  QChartView *chartView;
+
+  /// Pointer to the waterfall diagram
+  WaterFall *waterFall;
+
+  /// Currently plotted KPI type
+  PlotTypeGnb plotType;
+};
+
+/// Widget showing one selectable UE KPI
+class PainterWidgetUE : public QWidget, public ValueProvider {
+  Q_OBJECT
+
+ public:
+  /// Constructor
+  /// \param config Pointer to the dialog box for configuring UE KPI Limits
+  /// \param comboBox Pointer to the drop-down list selecting the KPI to be shown here
+  /// \param ue Pointer to the UE parameters
+  PainterWidgetUE(QWidget *config, QComboBox *comboBox, PHY_VARS_NR_UE *ue);
+
+  /// This function provides the current KPI value to be plotted
+  virtual float getValue() override;
+
+ protected:
+  /// This function is called to change the widget size
+  /// \param event Pointer to the resize event
+  virtual void resizeEvent(QResizeEvent *event) override;
+
+ public slots:
+  /// This function is called when a different KPI is selected
+  /// \param type selected KPI type
+  void makeConnections(int type);
+
+ private:
+  /// Pointer to the dialog box for configuring UE KPI Limits
+  QWidget *config;
+
+  /// Pointer to the drop-down list selecting the KPI to be shown here
+  QComboBox *comboBox;
+
+  /// Pointer to the UE parameters
+  PHY_VARS_NR_UE *ue;
+
+  /// Pointer to a class to view all QChart based KPIs
+  QChartView *chartView;
+
+  /// Pointer to the waterfall diagram
+  WaterFall *waterFall;
+
+  /// Currently plotted KPI type
+  PlotTypeUE plotType;
+};
+
+#endif // QT_SCOPE_MAINWINDOW_H
diff --git a/openair1/PHY/TOOLS/nr_phy_scope.c b/openair1/PHY/TOOLS/nr_phy_scope.c
index 7fd73a1b64..5a4562cb58 100644
--- a/openair1/PHY/TOOLS/nr_phy_scope.c
+++ b/openair1/PHY/TOOLS/nr_phy_scope.c
@@ -1042,6 +1042,7 @@ STATICFORXSCOPE OAI_phy_scope_t *create_phy_scope_nrue(int ID)
   // LLR of PDCCH
   fdui->graph[5] = nrUEcommonGraph(uePcchLLR,
                                    FL_POINTS_XYPLOT, 0, curY, 500, 100, "PDCCH Log-Likelihood Ratios (LLR, mag)", FL_CYAN );
+  fl_set_xyplot_xgrid(fdui->graph[5].graph,FL_GRID_MAJOR);
   fdui->graph[5].chartid = SCOPEMSG_DATAID_LLR; // tells websrv frontend to use LLR chart for displaying
   fdui->graph[5].datasetid = 1; // tells websrv frontend to use dataset index 1 in LLR chart
   // I/Q PDCCH comp
@@ -1054,6 +1055,7 @@ STATICFORXSCOPE OAI_phy_scope_t *create_phy_scope_nrue(int ID)
   // LLR of PDSCH
   fdui->graph[7] = nrUEcommonGraph(uePdschLLR,
                                    FL_POINTS_XYPLOT, 0, curY, 500, 200, "PDSCH Log-Likelihood Ratios (LLR, mag)", FL_YELLOW );
+  fl_set_xyplot_xgrid(fdui->graph[7].graph,FL_GRID_MAJOR);
   fdui->graph[7].chartid = SCOPEMSG_DATAID_LLR; // tells websrv frontend to use LLR chart for displaying
   fdui->graph[7].datasetid = 2; // tells websrv frontend to use dataset index 2 in LLR chart
   // I/Q PDSCH comp
@@ -1139,49 +1141,6 @@ static void *nrUEscopeThread(void *arg) {
 
 pthread_mutex_t UEcopyDataMutex;
 
-void UEcopyData(PHY_VARS_NR_UE *ue, enum UEdataType type, void *dataIn, int elementSz, int colSz, int lineSz) {
-  // Local static copy of the scope data bufs
-  // The active data buf is alterned to avoid interference between the Scope thread (display) and the Rx thread (data input)
-  // Index of "2" could be set to the number of Rx threads + 1
-  static scopeGraphData_t *copyDataBufs[UEdataTypeNumberOfItems][3] = {0};
-  static int  copyDataBufsIdx[UEdataTypeNumberOfItems] = {0};
-
-  scopeData_t *tmp=(scopeData_t *)ue->scopeData;
-
-  if (tmp) {
-    // Begin of critical zone between UE Rx threads that might copy new data at the same time:
-    pthread_mutex_lock(&UEcopyDataMutex);
-    int newCopyDataIdx = (copyDataBufsIdx[type]<2)?copyDataBufsIdx[type]+1:0;
-    copyDataBufsIdx[type] = newCopyDataIdx;
-    pthread_mutex_unlock(&UEcopyDataMutex);
-    // End of critical zone between UE Rx threads
-
-    // New data will be copied in a different buffer than the live one
-    scopeGraphData_t *copyData= copyDataBufs[type][newCopyDataIdx];
-
-    if (copyData == NULL || copyData->dataSize < elementSz*colSz*lineSz) {
-      scopeGraphData_t *ptr=realloc(copyData, sizeof(scopeGraphData_t) + elementSz*colSz*lineSz);
-
-      if (!ptr) {
-        LOG_E(PHY,"can't realloc\n");
-        return;
-      } else {
-        copyData=ptr;
-      }
-    }
-
-    copyData->dataSize=elementSz*colSz*lineSz;
-    copyData->elementSz=elementSz;
-    copyData->colSz=colSz;
-    copyData->lineSz=lineSz;
-    memcpy(copyData+1, dataIn,  elementSz*colSz*lineSz);
-    copyDataBufs[type][newCopyDataIdx] = copyData;
-
-    // The new data just copied in the local static buffer becomes live now
-    ((scopeGraphData_t **)tmp->liveData)[type]=copyData;
-  }
-}
-
 STATICFORXSCOPE void nrUEinitScope(PHY_VARS_NR_UE *ue)
 {
   AssertFatal(ue->scopeData=malloc(sizeof(scopeData_t)),"");
diff --git a/openair1/PHY/TOOLS/phy_scope.h b/openair1/PHY/TOOLS/phy_scope.h
index 06c85f3641..ac3eb62814 100644
--- a/openair1/PHY/TOOLS/phy_scope.h
+++ b/openair1/PHY/TOOLS/phy_scope.h
@@ -40,13 +40,6 @@
 typedef c16_t scopeSample_t;
 #define SquaredNorm(VaR) ((VaR).r * (VaR).r + (VaR).i * (VaR).i)
 
-typedef struct {
-  int dataSize;
-  int elementSz;
-  int colSz;
-  int lineSz;
-} scopeGraphData_t;
-
 typedef struct OAIgraph {
   FL_OBJECT *graph;
   FL_OBJECT *text;
diff --git a/openair1/PHY/TOOLS/phy_scope_interface.c b/openair1/PHY/TOOLS/phy_scope_interface.c
index 7cd68c53d2..b567e96b03 100644
--- a/openair1/PHY/TOOLS/phy_scope_interface.c
+++ b/openair1/PHY/TOOLS/phy_scope_interface.c
@@ -52,3 +52,44 @@ int end_forms(void) {
 
   return -1;
 }
+
+void UEcopyData(PHY_VARS_NR_UE *ue, enum UEdataType type, void *dataIn, int elementSz, int colSz, int lineSz) {
+  // Local static copy of the scope data bufs
+  // The active data buf is alterned to avoid interference between the Scope thread (display) and the Rx thread (data input)
+  // Index of "2" could be set to the number of Rx threads + 1
+  static scopeGraphData_t *copyDataBufs[UEdataTypeNumberOfItems][2] = {0};
+  static int  copyDataBufsIdx[UEdataTypeNumberOfItems] = {0};
+
+  scopeData_t *tmp = (scopeData_t *)ue->scopeData;
+
+  if (tmp) {
+    // Begin of critical zone between UE Rx threads that might copy new data at the same time: might require a mutex
+    int newCopyDataIdx = (copyDataBufsIdx[type]==0)?1:0;
+    copyDataBufsIdx[type] = newCopyDataIdx;
+    // End of critical zone between UE Rx threads
+
+    // New data will be copied in a different buffer than the live one
+    scopeGraphData_t *copyData = copyDataBufs[type][newCopyDataIdx];
+
+    if (copyData == NULL || copyData->dataSize < elementSz*colSz*lineSz) {
+      scopeGraphData_t *ptr = (scopeGraphData_t*) realloc(copyData, sizeof(scopeGraphData_t) + elementSz*colSz*lineSz);
+
+      if (!ptr) {
+        LOG_E(PHY,"can't realloc\n");
+        return;
+      } else {
+        copyData = ptr;
+      }
+    }
+
+    copyData->dataSize = elementSz*colSz*lineSz;
+    copyData->elementSz = elementSz;
+    copyData->colSz = colSz;
+    copyData->lineSz = lineSz;
+    memcpy(copyData+1, dataIn,  elementSz*colSz*lineSz);
+    copyDataBufs[type][newCopyDataIdx] = copyData;
+
+    // The new data just copied in the local static buffer becomes live now
+    ((scopeGraphData_t **)tmp->liveData)[type] = copyData;
+  }
+}
diff --git a/openair1/PHY/TOOLS/phy_scope_interface.h b/openair1/PHY/TOOLS/phy_scope_interface.h
index 00efbdff24..b6d4480762 100644
--- a/openair1/PHY/TOOLS/phy_scope_interface.h
+++ b/openair1/PHY/TOOLS/phy_scope_interface.h
@@ -34,6 +34,14 @@
 #include <openair1/PHY/defs_gNB.h>
 #include <openair1/PHY/defs_nr_UE.h>
 
+typedef struct {
+  uint32_t nb_total;
+  uint32_t nb_nack;
+  uint32_t blockSize;   // block size, to be used for throughput calculation
+  uint16_t nofRBs;
+  uint8_t  dl_mcs;
+} extended_kpi_ue;
+
 typedef struct {
   int *argc;
   char **argv;
@@ -63,8 +71,19 @@ typedef struct scopeData_s {
   void (*copyData)(PHY_VARS_NR_UE *,enum UEdataType, void *data, int elementSz, int colSz, int lineSz);
 } scopeData_t;
 
+typedef struct {
+  int dataSize;
+  int elementSz;
+  int colSz;
+  int lineSz;
+} scopeGraphData_t;
+
 int load_softscope(char *exectype, void *initarg);
 int end_forms(void) ;
+void UEcopyData(PHY_VARS_NR_UE *ue, enum UEdataType type, void *dataIn, int elementSz, int colSz, int lineSz);
 
 #define UEscopeCopy(ue, type, ...) if(ue->scopeData) ((scopeData_t*)ue->scopeData)->copyData(ue, type, ##__VA_ARGS__);
+
+extended_kpi_ue* getKPIUE();
+
 #endif
diff --git a/openair1/PHY/TOOLS/readme.md b/openair1/PHY/TOOLS/readme.md
index f6671acc6d..18fc178c30 100644
--- a/openair1/PHY/TOOLS/readme.md
+++ b/openair1/PHY/TOOLS/readme.md
@@ -1,12 +1,31 @@
-
-To use the scope, run the xNB or the UE with option "-d"  
+## xForms-based Scope
+To use the scope, run the xNB or the UE with option "-d"
 
 Usage in gdb
 In gdb, when you break, you can refresh immediatly the scope view by calling the display function.
-The first paramter is the graph context, nevertheless we keep the last value for a dirty call in gdb (so you can use '0')  
+The first paramter is the graph context, nevertheless we keep the last value for a dirty call in gdb (so you can use '0')
 
 Example with no variable known
 phy_scope_nrUE(0, PHY_vars_UE_g[0][0], 0, 0, 0)
 
 or
 phy_scope_gNB(0, phy_vars_gnb, phy_vars_ru, UE_id)
+
+# Qt-based Scope
+## Building Instuctions
+For the new qt-based scopo designed for NR, please consider the following:
+
+1. run the gNB or the UE with the option '--dqt'.
+2. make sure to install the Qt5 packages before running the scope. Otherwise, the scope will NOT be displayed!
+3. if you need only to build the new scope, then add 'nrqtscope' after the '--lib-build' option. So, the complete
+   command would be
+
+   ```
+   ./build_oai --gNB -w USRP --nrUE --build-lib nrqtscope
+   ```
+
+## New Features
+1. New KPIs for both gNB and UE, e.g., BLER, MCS, throughout, and number of scheduled RBs.
+2. For each of the gNB and UE, a main widget is created with a 3x2 grid of sub-widgets, each to dispaly one KPI.
+3. Each of the sub-widgets has a drop-down list to choose the KPI to show in that sub-widget.
+4. Both of the gNB and UE scopes can be resized using the mouse movement.
diff --git a/openair1/PHY/defs_eNB.h b/openair1/PHY/defs_eNB.h
index a168652d1a..668716e1f9 100644
--- a/openair1/PHY/defs_eNB.h
+++ b/openair1/PHY/defs_eNB.h
@@ -759,7 +759,6 @@ typedef struct PHY_VARS_eNB_s {
   int32_t pusch_stats_mcs[NUMBER_OF_UE_MAX][10240];
   int32_t pusch_stats_bsr[NUMBER_OF_UE_MAX][10240];
   int32_t pusch_stats_BO[NUMBER_OF_UE_MAX][10240];
-  uint8_t *FS6bufferZone;
   int32_t pusch_signal_threshold;
 } PHY_VARS_eNB;
 
diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h
index a75529b1d3..e8259b5dae 100644
--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
@@ -36,8 +36,6 @@
 #include "defs_nr_common.h"
 #include "CODING/nrPolar_tools/nr_polar_pbch_defs.h"
 
-
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
diff --git a/openair1/PHY/impl_defs_nr.h b/openair1/PHY/impl_defs_nr.h
index 8d6437af74..afbe6830f5 100644
--- a/openair1/PHY/impl_defs_nr.h
+++ b/openair1/PHY/impl_defs_nr.h
@@ -139,7 +139,7 @@ typedef struct TDD_UL_DL_configCommon_s {
   struct TDD_UL_DL_configCommon_s *p_next;
 } TDD_UL_DL_configCommon_t;
 
-typedef struct {
+typedef struct TDD_UL_DL_SlotConfig_s {
   /// \ Identifies a slot within a dl-UL-TransmissionPeriodicity (given in tdd-UL-DL-configurationCommon)
   uint16_t slotIndex;
   /// \ The direction (downlink or uplink) for the symbols in this slot. "allDownlink" indicates that all symbols in this slot are used
@@ -154,7 +154,7 @@ typedef struct {
   /// Corresponds to L1 parameter 'number-of-UL-symbols-dedicated' (see 38.211, section FFS_Section)
   uint16_t nrofUplinkSymbols;
   /// \ for setting a sequence
-  struct TDD_UL_DL_SlotConfig_t *p_next_TDD_UL_DL_SlotConfig;
+  struct TDD_UL_DL_SlotConfig_s *p_next_TDD_UL_DL_SlotConfig;
 } TDD_UL_DL_SlotConfig_t;
 
 /***********************************************************************
diff --git a/openair1/PHY/phy_extern_nr_ue.h b/openair1/PHY/phy_extern_nr_ue.h
index 66d554f245..4701a16012 100644
--- a/openair1/PHY/phy_extern_nr_ue.h
+++ b/openair1/PHY/phy_extern_nr_ue.h
@@ -27,7 +27,7 @@
 
 #ifdef XFORMS
   #include "PHY/TOOLS/nr_phy_scope.h"
-  extern char do_forms;
+  extern uint32_t do_forms;
 #endif
 
 extern char* namepointer_chMag ;
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index a44edd830b..ebc3b76ec7 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -47,7 +47,6 @@
 #include <time.h>
 
 #include "intertask_interface.h"
-#include <executables/split_headers.h> 
 
 #define MBMS_NFAPI_SCHEDULER
 
@@ -724,12 +723,8 @@ void srs_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
   }
 }
 
-void fill_sr_indication(int UEid, PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,uint32_t stat) {
-  if ( split73 == SPLIT73_DU ) {
-    sendFs6Ulharq(fs6ULindicationSr, UEid, eNB, NULL, frame, subframe, NULL,0,0, rnti, stat);
-    return;
-  }
-
+void fill_sr_indication(int UEid, PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,uint32_t stat)
+{
   pthread_mutex_lock(&eNB->UL_INFO_mutex);
   nfapi_sr_indication_t       *sr_ind =         &eNB->UL_INFO.sr_ind;
   nfapi_sr_indication_body_t  *sr_ind_body =    &sr_ind->sr_indication_body;
@@ -1862,12 +1857,8 @@ void fill_ulsch_harq_indication (PHY_VARS_eNB *eNB, LTE_UL_eNB_HARQ_t *ulsch_har
 
 #define packetError(ConD, fmt, args...) if (!(ConD)) { LOG_E(PHY, fmt, args); goodPacket=false; }
 
-void fill_uci_harq_indication (int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask) {
-  if ( split73 == SPLIT73_DU ) {
-    sendFs6Ulharq(fs6ULindicationHarq, UEid, eNB, uci, frame, subframe, harq_ack, tdd_mapping_mode, tdd_multiplexing_mask, 0, 0);
-    return;
-  }
-  
+void fill_uci_harq_indication (int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask)
+{
   int DLSCH_id=find_dlsch(uci->rnti,eNB,SEARCH_EXIST);
 
   //AssertFatal(DLSCH_id>=0,"DLSCH_id doesn't exist rnti:%x\n", uci->rnti);
diff --git a/openair1/SCHED_NR/phy_frame_config_nr.c b/openair1/SCHED_NR/phy_frame_config_nr.c
index 9ed7255a84..49afffcdc6 100644
--- a/openair1/SCHED_NR/phy_frame_config_nr.c
+++ b/openair1/SCHED_NR/phy_frame_config_nr.c
@@ -187,7 +187,7 @@ void add_tdd_dedicated_configuration_nr(NR_DL_FRAME_PARMS *frame_parms, int slot
   if (next == 0) {
     frame_parms->p_TDD_UL_DL_ConfigDedicated = p_TDD_UL_DL_ConfigDedicated;
   } else {
-    p_previous_TDD_UL_DL_ConfigDedicated->p_next_TDD_UL_DL_SlotConfig = (struct TDD_UL_DL_SlotConfig_t *)p_TDD_UL_DL_ConfigDedicated;
+    p_previous_TDD_UL_DL_ConfigDedicated->p_next_TDD_UL_DL_SlotConfig = (TDD_UL_DL_SlotConfig_t *)p_TDD_UL_DL_ConfigDedicated;
   }
 
   p_TDD_UL_DL_ConfigDedicated->slotIndex = slotIndex;
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index e6bcfe4cc8..307b127e1a 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -56,7 +56,6 @@
 #include "unitary_defs.h"
 #include "dummy_functions.c"
 #include "executables/thread-common.h"
-#include "executables/split_headers.h"
 #include "common/ran_context.h"
 void feptx_ofdm(RU_t *ru, int frame, int subframe);
 void feptx_prec(RU_t *ru, int frame, int subframe);
@@ -92,14 +91,6 @@ static int cmpdouble(const void *p1, const void *p2) {
 RAN_CONTEXT_t RC;
 
 int emulate_rf = 0;
-int split73=0;
-void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
-  AssertFatal(false, "Must not be called in this context\n");
-}
-void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask, uint16_t rnti, int32_t stat) {
-  AssertFatal(false, "Must not be called in this context\n");
-}
-
 void handler(int sig) {
   void *array[10];
   size_t size;
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index b9228ca0d2..05e4273577 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -52,7 +52,6 @@
 #include "common/config/config_load_configmodule.h"
 #include "executables/thread-common.h"
 #include "executables/lte-softmodem.h"
-#include "executables/split_headers.h"
 #include "common/ran_context.h"
 #include "PHY/LTE_ESTIMATION/lte_estimation.h"
 
@@ -91,14 +90,6 @@ static int cmpdouble(const void *p1, const void *p2) {
 }
 
 RAN_CONTEXT_t RC;
-int split73=0;
-void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
-  AssertFatal(false, "Must not be called in this context\n");
-}
-void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask, uint16_t rnti, int32_t stat) {
-  AssertFatal(false, "Must not be called in this context\n");
-}
-
 extern void fep_full(RU_t *ru, int subframe);
 extern void ru_fep_full_2thread(RU_t *ru, int subframe);
 //extern void eNB_fep_full(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc);
diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c
index 9b6db46aa8..1fe4229c04 100644
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -99,6 +99,11 @@ nfapi_ue_release_request_body_t release_rntis;
 instance_t DUuniqInstance=0;
 instance_t CUuniqInstance=0;
 
+int nr_derive_key_ng_ran_star(uint16_t pci, uint64_t nr_arfcn_dl, const uint8_t key[32], uint8_t *key_ng_ran_star)
+{
+  return 0;
+}
+
 // dummy functions
 int dummy_nr_ue_ul_indication(nr_uplink_indication_t *ul_info)              { return(0);  }
 
diff --git a/openair1/SIMULATION/NR_PHY/prachsim.c b/openair1/SIMULATION/NR_PHY/prachsim.c
index 1e211b7eb7..cb7094fe77 100644
--- a/openair1/SIMULATION/NR_PHY/prachsim.c
+++ b/openair1/SIMULATION/NR_PHY/prachsim.c
@@ -94,6 +94,11 @@ int oai_nfapi_nr_rach_indication(nfapi_nr_rach_indication_t *ind) { return(0);
 instance_t DUuniqInstance=0;
 instance_t CUuniqInstance=0;
 
+int nr_derive_key_ng_ran_star(uint16_t pci, uint64_t nr_arfcn_dl, const uint8_t key[32], uint8_t *key_ng_ran_star)
+{
+  return 0;
+}
+
 void
 rrc_data_ind(
   const protocol_ctxt_t *const ctxt_pP,
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index fefae6581d..8685626284 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -95,6 +95,11 @@ nfapi_ue_release_request_body_t release_rntis;
 instance_t DUuniqInstance=0;
 instance_t CUuniqInstance=0;
 
+int nr_derive_key_ng_ran_star(uint16_t pci, uint64_t nr_arfcn_dl, const uint8_t key[32], uint8_t *key_ng_ran_star)
+{
+  return 0;
+}
+
 extern void fix_scd(NR_ServingCellConfig_t *scd);// forward declaration
 
 int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
diff --git a/openair2/COMMON/f1ap_messages_types.h b/openair2/COMMON/f1ap_messages_types.h
index cd89e8d871..159af160ea 100644
--- a/openair2/COMMON/f1ap_messages_types.h
+++ b/openair2/COMMON/f1ap_messages_types.h
@@ -138,16 +138,16 @@ typedef struct f1ap_setup_req_s {
     struct fdd_s {
       uint32_t ul_nr_arfcn;
       uint8_t ul_scs;
-      uint8_t ul_nrb;
+      uint16_t ul_nrb;
 
       uint32_t dl_nr_arfcn;
       uint8_t dl_scs;
-      uint8_t dl_nrb;
+      uint16_t dl_nrb;
 
       uint32_t sul_active;
       uint32_t sul_nr_arfcn;
       uint8_t sul_scs;
-      uint8_t sul_nrb;
+      uint16_t sul_nrb;
 
       uint8_t ul_num_frequency_bands;
       uint16_t ul_nr_band[32];
@@ -163,12 +163,12 @@ typedef struct f1ap_setup_req_s {
 
       uint32_t nr_arfcn;
       uint8_t scs;
-      uint8_t nrb;
+      uint16_t nrb;
 
       uint32_t sul_active;
       uint32_t sul_nr_arfcn;
       uint8_t sul_scs;
-      uint8_t sul_nrb;
+      uint16_t sul_nrb;
 
       uint8_t num_frequency_bands;
       uint16_t nr_band[32];
diff --git a/openair2/GNB_APP/gnb_app.c b/openair2/GNB_APP/gnb_app.c
index 680b566eec..6404b26418 100644
--- a/openair2/GNB_APP/gnb_app.c
+++ b/openair2/GNB_APP/gnb_app.c
@@ -32,7 +32,6 @@
 #include <nr_pdcp/nr_pdcp.h>
 #include <softmodem-common.h>
 #include <nr-softmodem.h>
-#include <split_headers.h>
 
 #include "gnb_app.h"
 #include "assertions.h"
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index c2e51db3ef..7cb7f774ce 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -2063,7 +2063,6 @@ UE_RNTI(module_id_t mod_idP,
   }
 
   //LOG_D(MAC, "[eNB %d] Couldn't find RNTI for UE %d\n", mod_idP, ue_idP);
-  //display_backtrace();
   return (NOT_A_RNTI);
 }
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 1282a0625c..6d968a513e 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -625,11 +625,12 @@ void nr_initiate_ra_proc(module_id_t module_idP,
     int loop = 0;
     if (ra->rnti == 0) { // This condition allows for the usage of a preconfigured rnti for the CFRA
       do {
-        ra->rnti = (taus() % 65518) + 1;
+        // 3GPP TS 38.321 version 15.13.0 Section 7.1 Table 7.1-1: RNTI values
+        ra->rnti = (taus() % 0xffef) + 1;
         loop++;
       } while (loop != 100
                && !((find_nr_UE(&nr_mac->UE_info, ra->rnti) == NULL) && (find_nr_RA_id(module_idP, CC_id, ra->rnti) == -1)
-                    && ra->rnti >= 1 && ra->rnti <= 65519));
+                    && ra->rnti >= 0x1 && ra->rnti <= 0xffef));
       if (loop == 100) {
         LOG_E(NR_MAC, "%s:%d:%s: [RAPROC] initialisation random access aborted\n", __FILE__, __LINE__, __FUNCTION__);
         abort();
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index dd44ce44f7..a3c5a2e95c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -699,11 +699,9 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
           continue;
         }
 
-
-	NR_UE_info_t* UE = add_new_nr_ue(gNB_mac, ra->rnti, ra->CellGroup);
+        NR_UE_info_t *UE = add_new_nr_ue(gNB_mac, ra->rnti, ra->CellGroup);
         if (!UE) {
           LOG_W(NR_MAC, "Random Access %i discarded at state %i (TC_RNTI %04x RNTI %04x): max number of users achieved!\n", i, ra->state,ra->rnti,current_rnti);
-
           nr_mac_remove_ra_rnti(gnb_mod_idP, ra->rnti);
           nr_clear_ra_proc(gnb_mod_idP, CC_idP, frameP, ra);
           return;
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
index 9a584a3b27..b102bf3b7f 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
@@ -32,7 +32,7 @@ void e1_add_drb(int is_gnb,
                 unsigned char *ciphering_key,
                 unsigned char *integrity_key)
 {
-  add_drb_am(is_gnb, ue_id, s, ciphering_algorithm, integrity_algorithm,
+  add_drb_am(is_gnb, ue_id, 0, s, ciphering_algorithm, integrity_algorithm,
              ciphering_key, integrity_key);
   LOG_I(PDCP, "%s:%s:%d: added DRB for UE ID %ld\n", __FILE__, __FUNCTION__, __LINE__, ue_id);
 }
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h b/openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h
index a4b44fb74a..68b146efeb 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h
@@ -45,7 +45,7 @@ void nr_pdcp_e1_add_drbs(eNB_flag_t enb_flag,
                          uint8_t        *const kUPenc,
                          uint8_t        *const kUPint);
 
-void add_drb_am(int is_gnb, ue_id_t rntiMaybeUEid, struct NR_DRB_ToAddMod *s,
+void add_drb_am(int is_gnb, ue_id_t rntiMaybeUEid, ue_id_t reestablish_ue_id, struct NR_DRB_ToAddMod *s,
                 int ciphering_algorithm,
                 int integrity_algorithm,
                 unsigned char *ciphering_key,
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index 190757d74c..87e3d53ff5 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -877,7 +877,7 @@ static void add_srb(int is_gnb, ue_id_t rntiMaybeUEid, struct NR_SRB_ToAddMod *s
   nr_pdcp_manager_unlock(nr_pdcp_ue_manager);
 }
 
-void add_drb_am(int is_gnb, ue_id_t rntiMaybeUEid, struct NR_DRB_ToAddMod *s, int ciphering_algorithm, int integrity_algorithm, unsigned char *ciphering_key, unsigned char *integrity_key)
+void add_drb_am(int is_gnb, ue_id_t rntiMaybeUEid, ue_id_t reestablish_ue_id, struct NR_DRB_ToAddMod *s, int ciphering_algorithm, int integrity_algorithm, unsigned char *ciphering_key, unsigned char *integrity_key)
 {
   nr_pdcp_entity_t *pdcp_drb;
   nr_pdcp_ue_t *ue;
@@ -962,6 +962,14 @@ void add_drb_am(int is_gnb, ue_id_t rntiMaybeUEid, struct NR_DRB_ToAddMod *s, in
                                   has_integrity ? integrity_key : NULL);
     nr_pdcp_ue_add_drb_pdcp_entity(ue, drb_id, pdcp_drb);
 
+    if (reestablish_ue_id > 0) {
+      nr_pdcp_ue_t *reestablish_ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, reestablish_ue_id);
+      if (reestablish_ue != NULL) {
+        pdcp_drb->tx_next = reestablish_ue->drb[drb_id - 1]->tx_next;
+        LOG_I(PDCP, "Applying tx_next %d in DRB %d from old UEid %lx to new UEid %lx\n", reestablish_ue->drb[drb_id - 1]->tx_next, drb_id, reestablish_ue_id, rntiMaybeUEid);
+      }
+    }
+
     LOG_D(PDCP, "%s:%d:%s: added drb %d to UE ID/RNTI %ld\n", __FILE__, __LINE__, __FUNCTION__, drb_id, rntiMaybeUEid);
 
     new_nr_sdap_entity(is_gnb, has_sdap_rx, has_sdap_tx, rntiMaybeUEid, pdusession_id, is_sdap_DefaultDRB, drb_id, mappedQFIs2Add, mappedQFIs2AddCount);
@@ -971,6 +979,7 @@ void add_drb_am(int is_gnb, ue_id_t rntiMaybeUEid, struct NR_DRB_ToAddMod *s, in
 
 static void add_drb(int is_gnb,
                     ue_id_t rntiMaybeUEid,
+                    ue_id_t reestablish_ue_id,
                     struct NR_DRB_ToAddMod *s,
                     NR_RLC_Config_t *rlc_Config,
                     int ciphering_algorithm,
@@ -980,12 +989,12 @@ static void add_drb(int is_gnb,
 {
   switch (rlc_Config->present) {
   case NR_RLC_Config_PR_am:
-    add_drb_am(is_gnb, rntiMaybeUEid, s, ciphering_algorithm, integrity_algorithm, ciphering_key, integrity_key);
+    add_drb_am(is_gnb, rntiMaybeUEid, reestablish_ue_id, s, ciphering_algorithm, integrity_algorithm, ciphering_key, integrity_key);
     break;
   case NR_RLC_Config_PR_um_Bi_Directional:
     // add_drb_um(rntiMaybeUEid, s);
     /* hack */
-    add_drb_am(is_gnb, rntiMaybeUEid, s, ciphering_algorithm, integrity_algorithm, ciphering_key, integrity_key);
+    add_drb_am(is_gnb, rntiMaybeUEid, reestablish_ue_id, s, ciphering_algorithm, integrity_algorithm, ciphering_key, integrity_key);
     break;
   default:
     LOG_E(PDCP, "%s:%d:%s: fatal: unhandled DRB type\n",
@@ -1011,6 +1020,7 @@ void nr_pdcp_add_srbs(eNB_flag_t enb_flag, ue_id_t rntiMaybeUEid, NR_SRB_ToAddMo
 
 void nr_pdcp_add_drbs(eNB_flag_t enb_flag,
                       ue_id_t rntiMaybeUEid,
+                      ue_id_t reestablish_ue_id,
                       NR_DRB_ToAddModList_t *const drb2add_list,
                       const uint8_t security_modeP,
                       uint8_t *const kUPenc,
@@ -1019,7 +1029,7 @@ void nr_pdcp_add_drbs(eNB_flag_t enb_flag,
 {
   if (drb2add_list != NULL) {
     for (int i = 0; i < drb2add_list->list.count; i++) {
-      add_drb(enb_flag, rntiMaybeUEid, drb2add_list->list.array[i], rlc_bearer2add_list->list.array[i]->rlc_Config, security_modeP & 0x0f, (security_modeP >> 4) & 0x0f, kUPenc, kUPint);
+      add_drb(enb_flag, rntiMaybeUEid, reestablish_ue_id, drb2add_list->list.array[i], rlc_bearer2add_list->list.array[i]->rlc_Config, security_modeP & 0x0f, (security_modeP >> 4) & 0x0f, kUPenc, kUPint);
     }
   } else
     LOG_W(PDCP, "nr_pdcp_add_drbs() with void list\n");
@@ -1109,7 +1119,7 @@ void nr_DRB_preconfiguration(ue_id_t crntiMaybeUEid)
     PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_NO, crntiMaybeUEid, 0, 0, 0);
   }
 
-  nr_pdcp_add_drbs(ctxt.enb_flag, ctxt.rntiMaybeUEid, rbconfig->drb_ToAddModList, 0, NULL, NULL, Rlc_Bearer_ToAdd_list);
+  nr_pdcp_add_drbs(ctxt.enb_flag, ctxt.rntiMaybeUEid, 0, rbconfig->drb_ToAddModList, 0, NULL, NULL, Rlc_Bearer_ToAdd_list);
 
   nr_rrc_rlc_config_asn1_req(&ctxt, (NR_SRB_ToAddModList_t *)NULL, rbconfig->drb_ToAddModList, rbconfig->drb_ToReleaseList, Rlc_Bearer_ToAdd_list);
 
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index cab47402e6..4c82f0b8f3 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -7916,7 +7916,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
         else
           failure_cause = "UE not in handover";
 
-          LOG_W(RRC, "[eNB %ld] cannot process (%s) X2 HANDOVER CANCEL for rnti %x, cause %s, ignoring\n", instance, failure_cause, X2AP_HANDOVER_CANCEL(msg_p).rnti, cause);
+        LOG_W(RRC, "[eNB %ld] cannot process (%s) X2 HANDOVER CANCEL for rnti %x, cause %s, ignoring\n", instance, failure_cause, X2AP_HANDOVER_CANCEL(msg_p).rnti, cause);
       }
 
       break;
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c
index 6e57409228..e7a690b7c1 100644
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c
@@ -46,6 +46,7 @@
 #include "LAYER2/nr_rlc/nr_rlc_oai_api.h"
 #include "asn1_msg.h"
 #include "../nr_rrc_proto.h"
+#include "UTIL/OSA/osa_defs.h"
 #include "RRC/NR/nr_rrc_extern.h"
 #include "NR_DL-CCCH-Message.h"
 #include "NR_UL-CCCH-Message.h"
@@ -1013,7 +1014,7 @@ void fill_mastercellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, NR_CellGr
   // DRB Configuration
   for (int i = bearer_id_start; i < bearer_id_start + nb_bearers_to_setup; i++ ){
     const NR_RLC_Config_PR rlc_conf = use_rlc_um_for_drb ? NR_RLC_Config_PR_um_Bi_Directional : NR_RLC_Config_PR_am;
-    NR_RLC_BearerConfig_t *rlc_BearerConfig = get_DRB_RLC_BearerConfig(3 + i, i, rlc_conf, priority[i-1]);
+    NR_RLC_BearerConfig_t *rlc_BearerConfig = get_DRB_RLC_BearerConfig(3 + i, i, rlc_conf, priority[0]); // Fixme: priority hardcoded see caller function, all is wrong
     asn1cSeqAdd(&cellGroupConfig->rlc_BearerToAddModList->list, rlc_BearerConfig);
     asn1cSeqAdd(&ue_context_mastercellGroup->rlc_BearerToAddModList->list, rlc_BearerConfig);
   }
@@ -1283,7 +1284,7 @@ int do_RRCSetup(rrc_gNB_ue_context_t         *const ue_context_pP,
 				     buffer,
 				     1000);
 
-    
+
     AssertFatal(enc_rval.encoded >0, "ASN1 message encoding failed (%s, %lu)!\n",
 	    enc_rval.failed_type->name, enc_rval.encoded);
 
@@ -1388,7 +1389,7 @@ uint8_t do_NR_SA_UECapabilityEnquiry( const protocol_ctxt_t *const ctxt_pP,
 				   1024);
   AssertFatal(enc_rval.encoded >0, "ASN1 message encoding failed (%s, %lu)!\n",
               enc_rval.failed_type->name, enc_rval.encoded);
-  
+
 
   if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
     xer_fprint(stdout, &asn_DEF_NR_UE_CapabilityRequestFilterNR, (void *)sa_band_filter);
@@ -1415,16 +1416,14 @@ uint8_t do_NR_SA_UECapabilityEnquiry( const protocol_ctxt_t *const ctxt_pP,
 
   AssertFatal(enc_rval.encoded >0, "ASN1 message encoding failed (%s, %lu)!\n",
               enc_rval.failed_type->name, enc_rval.encoded);
-  
+
   LOG_D(NR_RRC, "[gNB %d] NR UECapabilityRequest for UE %lx Encoded %zd bits (%zd bytes)\n", ctxt_pP->module_id, ctxt_pP->rntiMaybeUEid, enc_rval.encoded, (enc_rval.encoded + 7) / 8);
 
   return((enc_rval.encoded+7)/8);
 }
 
-
-uint8_t do_NR_RRCRelease(uint8_t                            *buffer,
-                         size_t                              buffer_size,
-                         uint8_t                             Transaction_id) {
+int do_NR_RRCRelease(uint8_t *buffer, size_t buffer_size, uint8_t Transaction_id)
+{
   asn_enc_rval_t enc_rval;
   NR_DL_DCCH_Message_t dl_dcch_msg;
   NR_RRCRelease_t *rrcConnectionRelease;
@@ -1538,32 +1537,32 @@ int16_t do_RRCReconfiguration(
         xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void *) cellGroupConfig);
       }
       ie->nonCriticalExtension->masterCellGroup = calloc(1,sizeof(OCTET_STRING_t));
-      
+
       ie->nonCriticalExtension->masterCellGroup->buf = masterCellGroup_buf;
       ie->nonCriticalExtension->masterCellGroup->size = (enc_rval.encoded+7)/8;
     }
-    
+
     dl_dcch_msg.message.choice.c1->choice.rrcReconfiguration->criticalExtensions.choice.rrcReconfiguration = ie;
-    
+
     if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
       xer_fprint(stdout, &asn_DEF_NR_DL_DCCH_Message, (void *)&dl_dcch_msg);
     }
-    
+
     enc_rval = uper_encode_to_buffer(&asn_DEF_NR_DL_DCCH_Message,
                                      NULL,
                                      (void *)&dl_dcch_msg,
                                      buffer,
                                      buffer_size);
-    
+
     AssertFatal(enc_rval.encoded >0, "ASN1 message encoding failed (%s, %lu)!\n",
                 enc_rval.failed_type->name, enc_rval.encoded);
-    
+
     LOG_D(NR_RRC,"[gNB %d] RRCReconfiguration for UE %lx Encoded %zd bits (%zd bytes)\n",
           ctxt_pP->module_id,
           ctxt_pP->rntiMaybeUEid,
           enc_rval.encoded,
           (enc_rval.encoded+7)/8);
-    
+
     return((enc_rval.encoded+7)/8);
 }
 
@@ -1698,9 +1697,9 @@ uint8_t do_RRCSetupComplete(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size,
   NR_UL_DCCH_Message_t  ul_dcch_msg;
   NR_RRCSetupComplete_t *RrcSetupComplete;
   memset((void *)&ul_dcch_msg,0,sizeof(NR_UL_DCCH_Message_t));
-  
+
   uint8_t buf[6];
-  
+
   ul_dcch_msg.message.present = NR_UL_DCCH_MessageType_PR_c1;
   ul_dcch_msg.message.choice.c1 = CALLOC(1,sizeof(struct NR_UL_DCCH_MessageType__c1));
   ul_dcch_msg.message.choice.c1->present = NR_UL_DCCH_MessageType__c1_PR_rrcSetupComplete;
@@ -1713,7 +1712,7 @@ uint8_t do_RRCSetupComplete(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size,
   //   sizeof(*RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->nonCriticalExtension));
   RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->selectedPLMN_Identity = sel_plmn_id;
   RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->registeredAMF = NULL;
-  
+
   RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->ng_5G_S_TMSI_Value = CALLOC(1, sizeof(struct NR_RRCSetupComplete_IEs__ng_5G_S_TMSI_Value));
   RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->ng_5G_S_TMSI_Value->present = NR_RRCSetupComplete_IEs__ng_5G_S_TMSI_Value_PR_ng_5G_S_TMSI;
   RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->ng_5G_S_TMSI_Value->choice.ng_5G_S_TMSI.size = 6;
@@ -1724,13 +1723,13 @@ uint8_t do_RRCSetupComplete(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size,
   RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->ng_5G_S_TMSI_Value->choice.ng_5G_S_TMSI.buf[3] = 0x78;
   RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->ng_5G_S_TMSI_Value->choice.ng_5G_S_TMSI.buf[4] = 0x9A;
   RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->ng_5G_S_TMSI_Value->choice.ng_5G_S_TMSI.buf[5] = 0xBC;
-  
+
   memset(&RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->dedicatedNAS_Message,0,sizeof(OCTET_STRING_t));
   OCTET_STRING_fromBuf(&RrcSetupComplete->criticalExtensions.choice.rrcSetupComplete->dedicatedNAS_Message,dedicatedInfoNAS,dedicatedInfoNASLength);
   if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
     xer_fprint(stdout, &asn_DEF_NR_UL_DCCH_Message, (void *)&ul_dcch_msg);
   }
-  
+
   enc_rval = uper_encode_to_buffer(&asn_DEF_NR_UL_DCCH_Message,
                                    NULL,
                                    (void *)&ul_dcch_msg,
@@ -1739,7 +1738,7 @@ uint8_t do_RRCSetupComplete(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size,
   AssertFatal(enc_rval.encoded > 0,"ASN1 message encoding failed (%s, %lu)!\n",
               enc_rval.failed_type->name,enc_rval.encoded);
   LOG_D(NR_RRC,"RRCSetupComplete Encoded %zd bits (%zd bytes)\n",enc_rval.encoded,(enc_rval.encoded+7)/8);
-  
+
   return((enc_rval.encoded+7)/8);
 }
 
@@ -1844,133 +1843,139 @@ uint8_t do_RRCReestablishmentRequest(uint8_t Mod_id, uint8_t *buffer, uint16_t c
 }
 
 //------------------------------------------------------------------------------
-uint8_t
-do_RRCReestablishment(
-const protocol_ctxt_t     *const ctxt_pP,
-rrc_gNB_ue_context_t      *const ue_context_pP,
-int                              CC_id,
-uint8_t                   *const buffer,
-size_t                           buffer_size,
-//const uint8_t                    transmission_mode,
-const uint8_t                    Transaction_id,
-NR_SRB_ToAddModList_t               **SRB_configList
-) {
-    asn_enc_rval_t enc_rval;
-    //long *logicalchannelgroup = NULL;
-    struct NR_SRB_ToAddMod *SRB1_config = NULL;
-    struct NR_SRB_ToAddMod *SRB2_config = NULL;
-    //gNB_RRC_INST *nrrrc               = RC.nrrrc[ctxt_pP->module_id];
-    NR_DL_DCCH_Message_t dl_dcch_msg;
-    NR_RRCReestablishment_t *rrcReestablishment = NULL;
-    int i = 0;
-    ue_context_pP->ue_context.reestablishment_xid = Transaction_id;
-    NR_SRB_ToAddModList_t **SRB_configList2 = NULL;
-    SRB_configList2 = &ue_context_pP->ue_context.SRB_configList2[Transaction_id];
+int do_RRCReestablishment(const protocol_ctxt_t *const ctxt_pP,
+                              rrc_gNB_ue_context_t *const ue_context_pP,
+                              int CC_id,
+                              uint8_t *const buffer,
+                              size_t buffer_size,
+                              const uint8_t Transaction_id,
+                              NR_SRB_ToAddModList_t **SRB_configList,
+                              const uint8_t *masterCellGroup_from_DU,
+                              NR_ServingCellConfigCommon_t *scc,
+                              rrc_gNB_carrier_data_t *carrier)
+{
+  asn_enc_rval_t enc_rval;
+  struct NR_SRB_ToAddMod *SRB1_config = NULL;
+  struct NR_SRB_ToAddMod *SRB2_config = NULL;
+  NR_DL_DCCH_Message_t dl_dcch_msg = {0};
+  NR_RRCReestablishment_t *rrcReestablishment = NULL;
+  ue_context_pP->ue_context.reestablishment_xid = Transaction_id;
+  NR_SRB_ToAddModList_t **SRB_configList2 = NULL;
+  SRB_configList2 = &ue_context_pP->ue_context.SRB_configList2[Transaction_id];
 
-    if (*SRB_configList2) {
-      free(*SRB_configList2);
-    }
+  if (*SRB_configList2) {
+    free(*SRB_configList2);
+  }
 
-    *SRB_configList2 = CALLOC(1, sizeof(NR_SRB_ToAddModList_t));
-    memset((void *)&dl_dcch_msg, 0, sizeof(NR_DL_DCCH_Message_t));
-    dl_dcch_msg.message.present           = NR_DL_DCCH_MessageType_PR_c1;
-    dl_dcch_msg.message.choice.c1 = calloc(1,sizeof(struct NR_DL_DCCH_MessageType__c1));
-    dl_dcch_msg.message.choice.c1->present = NR_DL_DCCH_MessageType__c1_PR_rrcReestablishment;
-    dl_dcch_msg.message.choice.c1->choice.rrcReestablishment = CALLOC(1,sizeof(NR_RRCReestablishment_t));
-    rrcReestablishment = dl_dcch_msg.message.choice.c1->choice.rrcReestablishment;
+  *SRB_configList2 = CALLOC(1, sizeof(NR_SRB_ToAddModList_t));
+  dl_dcch_msg.message.present = NR_DL_DCCH_MessageType_PR_c1;
+  dl_dcch_msg.message.choice.c1 = calloc(1, sizeof(struct NR_DL_DCCH_MessageType__c1));
+  dl_dcch_msg.message.choice.c1->present = NR_DL_DCCH_MessageType__c1_PR_rrcReestablishment;
+  dl_dcch_msg.message.choice.c1->choice.rrcReestablishment = CALLOC(1, sizeof(NR_RRCReestablishment_t));
+  rrcReestablishment = dl_dcch_msg.message.choice.c1->choice.rrcReestablishment;
 
-    // get old configuration of SRB2
-    if (*SRB_configList != NULL) {
-      for (i = 0; (i < (*SRB_configList)->list.count) && (i < 3); i++) {
-        LOG_D(NR_RRC, "(*SRB_configList)->list.array[%d]->srb_Identity=%ld\n",
-              i, (*SRB_configList)->list.array[i]->srb_Identity);
-    
-        if ((*SRB_configList)->list.array[i]->srb_Identity == 2 ) {
-          SRB2_config = (*SRB_configList)->list.array[i];
-        } else if ((*SRB_configList)->list.array[i]->srb_Identity == 1 ) {
-          SRB1_config = (*SRB_configList)->list.array[i];
-        }
+  // get old configuration of SRB2
+  if (*SRB_configList != NULL) {
+    for (int i = 0; (i < (*SRB_configList)->list.count) && (i < 3); i++) {
+      LOG_D(NR_RRC, "(*SRB_configList)->list.array[%d]->srb_Identity=%ld\n", i, (*SRB_configList)->list.array[i]->srb_Identity);
+      if ((*SRB_configList)->list.array[i]->srb_Identity == 2) {
+        SRB2_config = (*SRB_configList)->list.array[i];
+      } else if ((*SRB_configList)->list.array[i]->srb_Identity == 1) {
+        SRB1_config = (*SRB_configList)->list.array[i];
       }
     }
+  }
 
-    if (SRB1_config == NULL) {
-      // default SRB1 configuration
-      LOG_W(NR_RRC,"SRB1 configuration does not exist in SRB configuration list, use default\n");
-      /// SRB1
-      SRB1_config = CALLOC(1, sizeof(*SRB1_config));
-      SRB1_config->srb_Identity = 1;
+  if (SRB1_config == NULL) {
+    // default SRB1 configuration
+    LOG_W(NR_RRC, "SRB1 configuration does not exist in SRB configuration list, use default\n");
+    /// SRB1
+    SRB1_config = CALLOC(1, sizeof(*SRB1_config));
+    SRB1_config->srb_Identity = 1;
+  }
+
+  if (SRB2_config == NULL) {
+    LOG_W(NR_RRC, "SRB2 configuration does not exist in SRB configuration list\n");
+  } else {
+    asn1cSeqAdd(&(*SRB_configList2)->list, SRB2_config);
+  }
+
+  if (*SRB_configList) {
+    free(*SRB_configList);
+  }
+
+  *SRB_configList = CALLOC(1, sizeof(NR_SRB_ToAddModList_t));
+  asn1cSeqAdd(&(*SRB_configList)->list, SRB1_config);
+  /****************************** masterCellGroup ******************************/
+  /*
+   NR_CellGroupConfig_t *cellGroupConfig = NULL;
+   char masterCellGroup_buf[1000];
+   gNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context;
+   if (masterCellGroup_from_DU) {
+    // decode masterCellGroup OCTET_STRING received from DU and place in ue context
+    uper_decode(NULL,
+    &asn_DEF_NR_CellGroupConfig,   //might be added prefix later
+    (void **)&cellGroupConfig,
+    (uint8_t *)masterCellGroup_from_DU->buf,
+    masterCellGroup_from_DU->size, 0, 0);
+
+    xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void*)cellGroupConfig);
+  }
+  else {
+    cellGroupConfig = calloc(1, sizeof(NR_CellGroupConfig_t));
+    fill_initial_cellGroupConfig(ue_context_pP->ue_context.rnti,ue_context_pP->local_uid,cellGroupConfig,scc,carrier);
+
+    enc_rval = uper_encode_to_buffer(&asn_DEF_NR_CellGroupConfig,
+             NULL,
+             (void *)cellGroupConfig,
+             masterCellGroup_buf,
+             1000);
+
+    if(enc_rval.encoded == -1) {
+      LOG_E(NR_RRC, "ASN1 message CellGroupConfig encoding failed (%s, %lu)!\n",
+      enc_rval.failed_type->name, enc_rval.encoded);
+      return -1;
     }
+  }
+  ue_p->masterCellGroup = cellGroupConfig;
+  */
+  rrcReestablishment->rrc_TransactionIdentifier = Transaction_id;
+  rrcReestablishment->criticalExtensions.present = NR_RRCReestablishment__criticalExtensions_PR_rrcReestablishment;
+  rrcReestablishment->criticalExtensions.choice.rrcReestablishment = CALLOC(1, sizeof(NR_RRCReestablishment_IEs_t));
 
-    if (SRB2_config == NULL) {
-      LOG_W(NR_RRC,"SRB2 configuration does not exist in SRB configuration list\n");
-    } else {
-      asn1cSeqAdd(&(*SRB_configList2)->list, SRB2_config);
-    }
+  uint16_t pci = RC.nrrrc[ctxt_pP->module_id]->carrier.physCellId;
+  uint32_t nr_arfcn_dl = (uint64_t)*scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB;
+  LOG_I(NR_RRC, "Reestablishment update key pci=%d, earfcn_dl=%u\n", pci, nr_arfcn_dl);
 
-    if (*SRB_configList) {
-      free(*SRB_configList);
-    }
+  // 3GPP TS 33.501 Section 6.11 Security handling for RRC connection re-establishment procedure
+  if (ue_context_pP->ue_context.nh_ncc >= 0) {
+    nr_derive_key_ng_ran_star(pci, nr_arfcn_dl, ue_context_pP->ue_context.nh, ue_context_pP->ue_context.kgnb);
+    rrcReestablishment->criticalExtensions.choice.rrcReestablishment->nextHopChainingCount = ue_context_pP->ue_context.nh_ncc;
+  } else { // first HO
+    nr_derive_key_ng_ran_star(pci, nr_arfcn_dl, ue_context_pP->ue_context.kgnb, ue_context_pP->ue_context.kgnb);
+    // LG: really 1
+    rrcReestablishment->criticalExtensions.choice.rrcReestablishment->nextHopChainingCount = 0;
+  }
 
-    *SRB_configList = CALLOC(1, sizeof(LTE_SRB_ToAddModList_t));
-    asn1cSeqAdd(&(*SRB_configList)->list,SRB1_config);
+  ue_context_pP->ue_context.kgnb_ncc = 0;
+  rrcReestablishment->criticalExtensions.choice.rrcReestablishment->lateNonCriticalExtension = NULL;
+  rrcReestablishment->criticalExtensions.choice.rrcReestablishment->nonCriticalExtension = NULL;
 
-    rrcReestablishment->rrc_TransactionIdentifier = Transaction_id;
-    rrcReestablishment->criticalExtensions.present = NR_RRCReestablishment__criticalExtensions_PR_rrcReestablishment;
-    rrcReestablishment->criticalExtensions.choice.rrcReestablishment = CALLOC(1,sizeof(NR_RRCReestablishment_IEs_t));
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
+    xer_fprint(stdout, &asn_DEF_NR_DL_DCCH_Message, (void *)&dl_dcch_msg);
+  }
 
-    uint8_t KgNB_star[32] = { 0 };
-    /** TODO
-    uint16_t pci = nrrrc->carrier[CC_id].physCellId;
-    uint32_t earfcn_dl = (uint32_t)freq_to_arfcn10(RC.mac[ctxt_pP->module_id]->common_channels[CC_id].eutra_band,
-                         nrrrc->carrier[CC_id].dl_CarrierFreq);
-    bool     is_rel8_only = true;
-    
-    if (earfcn_dl > 65535) {
-      is_rel8_only = false;
-    }
-    LOG_D(NR_RRC, "pci=%d, eutra_band=%d, downlink_frequency=%d, earfcn_dl=%u, is_rel8_only=%s\n",
-          pci,
-          RC.mac[ctxt_pP->module_id]->common_channels[CC_id].eutra_band,
-          nrrrc->carrier[CC_id].dl_CarrierFreq,
-          earfcn_dl,
-          is_rel8_only == true ? "true": "false");
-    */
-    
-    if (ue_context_pP->ue_context.nh_ncc >= 0) {
-      //TODO derive_keNB_star(ue_context_pP->ue_context.nh, pci, earfcn_dl, is_rel8_only, KgNB_star);
-      rrcReestablishment->criticalExtensions.choice.rrcReestablishment->nextHopChainingCount = ue_context_pP->ue_context.nh_ncc;
-    } else { // first HO
-      //TODO derive_keNB_star (ue_context_pP->ue_context.kgnb, pci, earfcn_dl, is_rel8_only, KgNB_star);
-      // LG: really 1
-      rrcReestablishment->criticalExtensions.choice.rrcReestablishment->nextHopChainingCount = 0;
-    }
-    // copy KgNB_star to ue_context_pP->ue_context.kgnb
-    memcpy (ue_context_pP->ue_context.kgnb, KgNB_star, 32);
-    ue_context_pP->ue_context.kgnb_ncc = 0;
-    rrcReestablishment->criticalExtensions.choice.rrcReestablishment->lateNonCriticalExtension = NULL;
-    rrcReestablishment->criticalExtensions.choice.rrcReestablishment->nonCriticalExtension = NULL;
+  enc_rval = uper_encode_to_buffer(&asn_DEF_NR_DL_DCCH_Message, NULL, (void *)&dl_dcch_msg, buffer, 100);
 
-    if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
-      xer_fprint(stdout, &asn_DEF_NR_DL_DCCH_Message, (void *)&dl_dcch_msg);
-    }
-
-    enc_rval = uper_encode_to_buffer(&asn_DEF_NR_DL_DCCH_Message,
-                                     NULL,
-                                     (void *)&dl_dcch_msg,
-                                     buffer,
-                                     100);
-
-    AssertFatal(enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n",
-                enc_rval.failed_type->name, enc_rval.encoded);
-    
-    LOG_D(NR_RRC,"RRCReestablishment Encoded %u bits (%u bytes)\n",
-          (uint32_t)enc_rval.encoded, (uint32_t)(enc_rval.encoded+7)/8);
-    return((enc_rval.encoded+7)/8);
+  AssertFatal(enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n",
+              enc_rval.failed_type->name, enc_rval.encoded);
 
+  LOG_D(NR_RRC, "RRCReestablishment Encoded %u bits (%u bytes)\n", (uint32_t)enc_rval.encoded, (uint32_t)(enc_rval.encoded + 7) / 8);
+  return ((enc_rval.encoded + 7) / 8);
 }
 
-uint8_t 
-do_RRCReestablishmentComplete(uint8_t *buffer, size_t buffer_size, int64_t rrc_TransactionIdentifier) {
+int do_RRCReestablishmentComplete(uint8_t *buffer, size_t buffer_size, int64_t rrc_TransactionIdentifier)
+{
   asn_enc_rval_t enc_rval;
   NR_UL_DCCH_Message_t ul_dcch_msg;
   NR_RRCReestablishmentComplete_t *rrcReestablishmentComplete;
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.h b/openair2/RRC/NR/MESSAGES/asn1_msg.h
index 87124c1172..090bbb5c84 100644
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.h
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.h
@@ -119,8 +119,7 @@ uint8_t do_NR_SA_UECapabilityEnquiry( const protocol_ctxt_t *const ctxt_pP,
                                    uint8_t               *const buffer,
                                    const uint8_t                Transaction_id);
 
-uint8_t do_NR_RRCRelease(uint8_t *buffer, size_t buffer_size,
-                         uint8_t Transaction_id);
+int do_NR_RRCRelease(uint8_t *buffer, size_t buffer_size, uint8_t Transaction_id);
 
 int16_t do_RRCReconfiguration(
     const protocol_ctxt_t        *const ctxt_pP,
@@ -174,22 +173,18 @@ uint8_t do_NR_ULInformationTransfer(uint8_t **buffer,
 
 uint8_t do_RRCReestablishmentRequest(uint8_t Mod_id, uint8_t *buffer, uint16_t c_rnti);
 
-uint8_t
-do_RRCReestablishment(
-  const protocol_ctxt_t     *const ctxt_pP,
-  rrc_gNB_ue_context_t      *const ue_context_pP,
-  int                              CC_id,
-  uint8_t                   *const buffer,
-  size_t                           buffer_size,
-  //const uint8_t                    transmission_mode,
-  const uint8_t                    Transaction_id,
-  NR_SRB_ToAddModList_t               **SRB_configList
-);
+int do_RRCReestablishment(const protocol_ctxt_t *const ctxt_pP,
+                              rrc_gNB_ue_context_t *const ue_context_pP,
+                              int CC_id,
+                              uint8_t *const buffer,
+                              size_t buffer_size,
+                              const uint8_t Transaction_id,
+                              NR_SRB_ToAddModList_t **SRB_configList,
+                              const uint8_t *masterCellGroup_from_DU,
+                              NR_ServingCellConfigCommon_t *scc,
+                              rrc_gNB_carrier_data_t *carrier);
 
-uint8_t 
-do_RRCReestablishmentComplete(
-    uint8_t *buffer, size_t buffer_size,
-    int64_t rrc_TransactionIdentifier);
+int do_RRCReestablishmentComplete(uint8_t *buffer, size_t buffer_size, int64_t rrc_TransactionIdentifier);
 
 NR_MeasConfig_t *get_defaultMeasConfig(const gNB_RrcConfigurationReq *conf);
 uint8_t do_NR_Paging(uint8_t Mod_id, uint8_t *buffer, uint32_t tmsi);
diff --git a/openair2/RRC/NR/cucp_cuup_direct.c b/openair2/RRC/NR/cucp_cuup_direct.c
index 12530c7b82..b74a7d1601 100644
--- a/openair2/RRC/NR/cucp_cuup_direct.c
+++ b/openair2/RRC/NR/cucp_cuup_direct.c
@@ -108,20 +108,17 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p,
   gtpv1u_gnb_create_tunnel_req_t  create_tunnel_req={0};
   gtpv1u_gnb_create_tunnel_resp_t create_tunnel_resp={0};
 
-  for (int i=0; i < ue_context_p->ue_context.nb_of_pdusessions; i++) {
-    pdu_session_param_t *pdu = ue_context_p->ue_context.pduSession + i;
-    create_tunnel_req.pdusession_id[i] = pdu->param.pdusession_id;
-    create_tunnel_req.incoming_rb_id[i] = i + 1;
-    create_tunnel_req.outgoing_qfi[i] = req->pduSession[i].DRBnGRanList[0].qosFlows[0].id;
-    memcpy(&create_tunnel_req.dst_addr[i].buffer,
-           &pdu->param.upf_addr.buffer,
-           sizeof(uint8_t)*20);
-    create_tunnel_req.dst_addr[i].length = pdu->param.upf_addr.length;
-    create_tunnel_req.outgoing_teid[i] = pdu->param.gtp_teid;
-  }
-  create_tunnel_req.num_tunnels = ue_context_p->ue_context.nb_of_pdusessions;
-  create_tunnel_req.ue_id       = ue_context_p->ue_context.rnti;
+  int i = ue_context_p->ue_context.nb_of_pdusessions - 1;
+  pdu_session_param_t *pdu = ue_context_p->ue_context.pduSession + i;
+  create_tunnel_req.pdusession_id[0] = pdu->param.pdusession_id;
+  create_tunnel_req.incoming_rb_id[0] = i + 1;
+  create_tunnel_req.outgoing_qfi[0] = req->pduSession[i].DRBnGRanList[0].qosFlows[0].id;
+  memcpy(&create_tunnel_req.dst_addr[0].buffer, &pdu->param.upf_addr.buffer, sizeof(create_tunnel_req.dst_addr[0].buffer));
+  create_tunnel_req.dst_addr[0].length = pdu->param.upf_addr.length;
+  create_tunnel_req.outgoing_teid[0] = pdu->param.gtp_teid;
 
+  create_tunnel_req.num_tunnels = 1;
+  create_tunnel_req.ue_id = ue_context_p->ue_context.rnti;
   int ret = gtpv1u_create_ngu_tunnel(getCxtE1(instance)->gtpInstN3, &create_tunnel_req, &create_tunnel_resp);
 
   if (ret != 0) {
@@ -130,8 +127,7 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p,
     return ret;
   }
 
-  nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(ctxt_p,
-                                               &create_tunnel_resp);
+  nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(ctxt_p, &create_tunnel_resp, i);
 
   uint8_t *kRRCenc = NULL;
   uint8_t *kRRCint = NULL;
@@ -164,7 +160,7 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p,
                    kRRCenc,
                    kRRCint);
                    
-  nr_pdcp_add_drbs(ctxt_p->enb_flag, ctxt_p->rntiMaybeUEid,
+  nr_pdcp_add_drbs(ctxt_p->enb_flag, ctxt_p->rntiMaybeUEid, 0,
                    DRB_configList,
                    (ue_context_p->ue_context.integrity_algorithm << 4)
                    | ue_context_p->ue_context.ciphering_algorithm,
diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index b8982d0bd5..bbc0ad07c7 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -298,6 +298,9 @@ typedef struct gNB_RRC_UE_s {
   NR_RRCReconfiguration_t            *reconfig;
   NR_RadioBearerConfig_t             *rb_config;
 
+  /* Pointer to save spCellConfig during RRC Reestablishment procedures */
+  NR_SpCellConfig_t                  *spCellConfigReestablishment;
+
   ImsiMobileIdentity_t               imsi;
 
   /* KgNB as derived from KASME received from EPC */
@@ -320,7 +323,7 @@ typedef struct gNB_RRC_UE_s {
   uint16_t                           ng_5G_S_TMSI_Part2;
   NR_EstablishmentCause_t            establishment_cause;
 
-  /* Information from UE RRC ConnectionReestablishmentRequest */
+  /* Information from UE RRCReestablishmentRequest */
   NR_ReestablishmentCause_t          reestablishment_cause;
 
   /* UE id for initial connection to S1AP */
@@ -342,9 +345,7 @@ typedef struct gNB_RRC_UE_s {
   uint8_t                            nb_of_modify_e_rabs;
   uint8_t                            nb_of_failed_e_rabs;
   nr_e_rab_param_t                   modify_e_rab[NB_RB_MAX];//[S1AP_MAX_E_RAB];
-  /* Total number of pdu session already setup in the list */
-  uint8_t                            setup_pdu_sessions;
-  /* Number of pdu session to be setup in the list */
+  /* Number of pdu session managed for the ue */
   uint8_t                            nb_of_pdusessions;
   /* Number of e_rab to be modified in the list */
   uint8_t                            nb_of_modify_pdusessions;
@@ -475,6 +476,11 @@ typedef struct cucp_cuup_if_s {
   cucp_cuup_bearer_context_setup_func_t bearer_context_mod;
 } cucp_cuup_if_t;
 
+typedef struct nr_reestablish_rnti_map_s {
+  ue_id_t ue_id;
+  rnti_t c_rnti;
+} nr_reestablish_rnti_map_t;
+
 //---NR---(completely change)---------------------
 typedef struct gNB_RRC_INST_s {
 
@@ -528,6 +534,8 @@ typedef struct gNB_RRC_INST_s {
   // security configuration (preferred algorithms)
   nr_security_configuration_t security;
 
+  nr_reestablish_rnti_map_t nr_reestablish_rnti_map[MAX_MOBILES_PER_GNB];
+
   nr_mac_rrc_dl_if_t mac_rrc;
   cucp_cuup_if_t cucp_cuup;
 
diff --git a/openair2/RRC/NR/nr_rrc_extern.h b/openair2/RRC/NR/nr_rrc_extern.h
index f5d9f4d2e4..34041b8a88 100644
--- a/openair2/RRC/NR/nr_rrc_extern.h
+++ b/openair2/RRC/NR/nr_rrc_extern.h
@@ -59,8 +59,4 @@ extern UE_PF_PO_t UE_PF_PO[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
 
 extern pthread_mutex_t ue_pf_po_mutex;
 
-extern uint16_t reestablish_rnti_map[MAX_MOBILES_PER_ENB][2];
-
 #endif
-
-
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index dc32e71aea..cac95239e5 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -210,6 +210,7 @@ void nr_pdcp_add_srbs(eNB_flag_t enb_flag, ue_id_t rntiMaybeUEid, NR_SRB_ToAddMo
 
 void nr_pdcp_add_drbs(eNB_flag_t enb_flag,
                       ue_id_t rntiMaybeUEid,
+                      ue_id_t reestablish_ue_id,
                       NR_DRB_ToAddModList_t *const drb2add_list,
                       const uint8_t security_modeP,
                       uint8_t *const kUPenc,
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 8e68e7312c..2deeea6e1f 100644
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -107,6 +107,15 @@
 
 extern RAN_CONTEXT_t RC;
 
+extern void pdcp_config_set_security(const protocol_ctxt_t *const ctxt_pP,
+                                     pdcp_t *const pdcp_pP,
+                                     const rb_id_t rb_idP,
+                                     const uint16_t lc_idP,
+                                     const uint8_t security_modeP,
+                                     uint8_t *const kRRCenc,
+                                     uint8_t *const kRRCint,
+                                     uint8_t *const  kUPenc);
+
 static inline uint64_t bitStr_to_uint64(BIT_STRING_t *asn);
 
 mui_t                               rrc_gNB_mui = 0;
@@ -316,6 +325,27 @@ static void apply_macrlc_config(gNB_RRC_INST *rrc, rrc_gNB_ue_context_t *const u
                              get_softmodem_params()->sa ? cgc->rlc_BearerToAddModList : NULL);
 }
 
+void apply_macrlc_config_reest(gNB_RRC_INST *rrc, rrc_gNB_ue_context_t *const ue_context_pP, const protocol_ctxt_t *const ctxt_pP, ue_id_t ue_id)
+{
+  rrc_mac_config_req_gNB(rrc->module_id,
+                         rrc->configuration.pdsch_AntennaPorts,
+                         rrc->configuration.pusch_AntennaPorts,
+                         rrc->configuration.sib1_tda,
+                         rrc->configuration.minRXTXTIME,
+                         NULL,
+                         NULL,
+                         NULL,
+                         0,
+                         ue_id,
+                         get_softmodem_params()->sa ? ue_context_pP->ue_context.masterCellGroup : NULL);
+
+  nr_rrc_rlc_config_asn1_req(ctxt_pP,
+                             ue_context_pP->ue_context.SRB_configList,
+                             NULL,
+                             NULL,
+                             get_softmodem_params()->sa ? ue_context_pP->ue_context.masterCellGroup->rlc_BearerToAddModList : NULL);
+}
+
 //-----------------------------------------------------------------------------
 static void rrc_gNB_generate_RRCSetup(const protocol_ctxt_t *const ctxt_pP,
                                       rrc_gNB_ue_context_t *const ue_context_pP,
@@ -420,6 +450,11 @@ static void rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(const protoc
   ue_context_pP->ue_context.ue_release_timer = 1;
   // remove UE after 10 frames after RRCConnectionRelease is triggered
   ue_context_pP->ue_context.ue_release_timer_thres = 1000;
+  // configure MAC
+  apply_macrlc_config(rrc_instance_p,ue_context_pP,ctxt_pP);
+
+  //nr_pdcp_add_srbs(ctxt_pP->enb_flag, ctxt_pP->rntiMaybeUEid, ue_context_pP->ue_context.SRB_configList, 0, NULL, NULL);
+  //apply_pdcp_config(ue_context_pP,ctxt_pP);
   /* init timers */
   //   ue_context_pP->ue_context.ue_rrc_inactivity_timer = 0;
 
@@ -479,6 +514,7 @@ static void rrc_gNB_process_RRCSetupComplete(const protocol_ctxt_t *const ctxt_p
       PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
   ue_context_pP->ue_context.Srb1.Active = 1;
   ue_context_pP->ue_context.Srb1.Srb_info.Srb_id = 1;
+  ue_context_pP->ue_context.Srb2.Active = 0;
   ue_context_pP->ue_context.StatusRrc = NR_RRC_CONNECTED;
 
   if (get_softmodem_params()->sa) {
@@ -538,7 +574,7 @@ static void rrc_gNB_generate_defaultRRCReconfiguration(const protocol_ctxt_t *co
   uint8_t buffer[RRC_BUF_SIZE] = {0};
   int size = do_RRCReconfiguration(ctxt_pP,
                                    buffer,
-                                   sizeof(buffer),
+                                   RRC_BUF_SIZE,
                                    xid,
                                    NULL, //*SRB_configList2,
                                    NULL, //*DRB_configList,
@@ -657,8 +693,7 @@ void fill_DRB_configList(const protocol_ctxt_t *const ctxt_pP,
   }
   *DRB_configList2 = CALLOC(1, sizeof(**DRB_configList2));
   memset(*DRB_configList2, 0, sizeof(**DRB_configList2));
-
-  for (i = 0; i < ue_context_pP->ue_context.setup_pdu_sessions; i++) {
+  for (i = 0; i < ue_context_pP->ue_context.nb_of_pdusessions; i++) {
     if (pdu_sessions_done >= ue_context_pP->ue_context.nb_of_pdusessions) {
       break;
     }
@@ -666,6 +701,7 @@ void fill_DRB_configList(const protocol_ctxt_t *const ctxt_pP,
     if (ue_context_pP->ue_context.pduSession[i].status >= PDU_SESSION_STATUS_DONE) {
       continue;
     }
+    ue_context_pP->ue_context.pduSession[i].xid = xid;
 
     for(long drb_id_add = 1; drb_id_add <= nb_drb_to_setup; drb_id_add++){
       uint8_t drb_id;
@@ -674,19 +710,18 @@ void fill_DRB_configList(const protocol_ctxt_t *const ctxt_pP,
       for (qos_flow_index = 0; qos_flow_index < ue_context_pP->ue_context.pduSession[i].param.nb_qos; qos_flow_index++) {
         switch (ue_context_pP->ue_context.pduSession[i].param.qos[qos_flow_index].fiveQI) {
           case 1 ... 4:  /* GBR */
-            drb_id = next_available_drb(ue_p, ue_context_pP->ue_context.pduSession[i].param.pdusession_id, GBR_FLOW);
+            drb_id = next_available_drb(ue_p, &ue_context_pP->ue_context.pduSession[i], GBR_FLOW);
             break;
           case 5 ... 9:  /* Non-GBR */
             if(rrc->configuration.drbs > 1) /* Force the creation from gNB Conf file - Should be used only in noS1 mode and rfsim for testing purposes. */
-              drb_id = next_available_drb(ue_p, ue_context_pP->ue_context.pduSession[i].param.pdusession_id, GBR_FLOW);
+              drb_id = next_available_drb(ue_p, &ue_context_pP->ue_context.pduSession[i], GBR_FLOW);
             else
-              drb_id = next_available_drb(ue_p, ue_context_pP->ue_context.pduSession[i].param.pdusession_id, NONGBR_FLOW);
+              drb_id = next_available_drb(ue_p, &ue_context_pP->ue_context.pduSession[i], NONGBR_FLOW);
             break;
 
           default:
             LOG_E(NR_RRC,"not supported 5qi %lu\n", ue_context_pP->ue_context.pduSession[i].param.qos[qos_flow_index].fiveQI);
             ue_context_pP->ue_context.pduSession[i].status = PDU_SESSION_STATUS_FAILED;
-            ue_context_pP->ue_context.pduSession[i].xid = xid;
             pdu_sessions_done++;
             continue;
         }
@@ -777,8 +812,6 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
   gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
   long drb_priority[1] = {13}; // For now, we assume only one drb per pdu sessions with a default preiority (will be dynamique in future)
   NR_CellGroupConfig_t *cellGroupConfig = NULL;
-  uint8_t  buffer[RRC_BUF_SIZE];
-  uint16_t size;
   int xid = -1;
 
   int drb_id_to_setup_start = 1;
@@ -791,23 +824,23 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
 
   for (int i=0; i < nb_drb_to_setup; i++) {
     NR_DRB_ToAddMod_t *DRB_config = DRB_configList->list.array[i];
-    if (drb_id_to_setup_start == 1) drb_id_to_setup_start = DRB_config->drb_Identity;
-
-    if (ue_context_pP->ue_context.pduSession[i].param.nas_pdu.buffer != NULL) {
+    if (drb_id_to_setup_start == 1)
+      drb_id_to_setup_start = DRB_config->drb_Identity;
+    int j = ue_context_pP->ue_context.nb_of_pdusessions - 1;
+    AssertFatal(j >= 0, "");
+    if (ue_context_pP->ue_context.pduSession[j].param.nas_pdu.buffer != NULL) {
       dedicatedNAS_Message = CALLOC(1, sizeof(NR_DedicatedNAS_Message_t));
       memset(dedicatedNAS_Message, 0, sizeof(OCTET_STRING_t));
-      OCTET_STRING_fromBuf(dedicatedNAS_Message,
-                            (char *)ue_context_pP->ue_context.pduSession[i].param.nas_pdu.buffer,
-                            ue_context_pP->ue_context.pduSession[i].param.nas_pdu.length);
+      OCTET_STRING_fromBuf(dedicatedNAS_Message, (char *)ue_context_pP->ue_context.pduSession[j].param.nas_pdu.buffer, ue_context_pP->ue_context.pduSession[j].param.nas_pdu.length);
       asn1cSeqAdd(&dedicatedNAS_MessageList->list, dedicatedNAS_Message);
 
-      LOG_I(NR_RRC,"add NAS info with size %d (pdusession id %d)\n",ue_context_pP->ue_context.pduSession[i].param.nas_pdu.length, i);
+      LOG_I(NR_RRC, "add NAS info with size %d (pdusession idx %d)\n", ue_context_pP->ue_context.pduSession[j].param.nas_pdu.length, j);
     } else {
       // TODO
-      LOG_E(NR_RRC,"no NAS info (pdusession id %d)\n", i);
+      LOG_E(NR_RRC, "no NAS info (pdusession idx %d)\n", j);
     }
 
-    xid = ue_context_pP->ue_context.pduSession[i].xid;
+    xid = ue_context_pP->ue_context.pduSession[j].xid;
   }
 
   /* If list is empty free the list and reset the address */
@@ -816,7 +849,6 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
     dedicatedNAS_MessageList = NULL;
   }
 
-  memset(buffer, 0, sizeof(buffer));
   if(cell_groupConfig_from_DU == NULL){
     cellGroupConfig = calloc(1, sizeof(NR_CellGroupConfig_t));
     // FIXME: fill_mastercellGroupConfig() won't fill the right priorities or
@@ -832,20 +864,23 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
   NR_SRB_ToAddModList_t *SRB_configList2 = NULL;
   SRB_configList2 = ue_context_pP->ue_context.SRB_configList2[xid];
 
-  size = do_RRCReconfiguration(ctxt_pP, buffer, sizeof(buffer),
-                                xid,
-                                SRB_configList2,
-                                DRB_configList,
-                                NULL,
-                                NULL,
-                                NULL,
-                                NULL,
-                                dedicatedNAS_MessageList,
-                                ue_context_pP,
-                                &rrc->carrier,
-                                &rrc->configuration,
-                                NULL,
-                                cellGroupConfig);
+  uint8_t buffer[RRC_BUF_SIZE] = {0};
+  int size = do_RRCReconfiguration(ctxt_pP,
+                                   buffer,
+                                   RRC_BUF_SIZE,
+                                   xid,
+                                   SRB_configList2,
+                                   DRB_configList,
+                                   NULL,
+                                   NULL,
+                                   NULL,
+                                   NULL,
+                                   dedicatedNAS_MessageList,
+                                   ue_context_pP,
+                                   &rrc->carrier,
+                                   &rrc->configuration,
+                                   NULL,
+                                   cellGroupConfig);
   LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size,"[MSG] RRC Reconfiguration\n");
 
   /* Free all NAS PDUs */
@@ -912,8 +947,6 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
   struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList
                                 *dedicatedNAS_MessageList = NULL;
   NR_DedicatedNAS_Message_t     *dedicatedNAS_Message = NULL;
-  uint8_t                        buffer[RRC_BUF_SIZE];
-  uint16_t                       size;
   int                            qos_flow_index = 0;
   int i, j;
 
@@ -1017,21 +1050,23 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
     dedicatedNAS_MessageList = NULL;
   }
 
-  memset(buffer, 0, sizeof(buffer));
-  size = do_RRCReconfiguration(ctxt_pP, buffer, sizeof(buffer),
-                                xid,
-                                NULL,
-                                DRB_configList2,
-                                NULL,
-                                NULL,
-                                NULL,
-                                NULL,
-                                dedicatedNAS_MessageList,
-                                NULL,
-                                NULL,
-                                NULL,
-                                NULL,
-                                NULL);
+  uint8_t buffer[RRC_BUF_SIZE];
+  int size = do_RRCReconfiguration(ctxt_pP,
+                                       buffer,
+                                       RRC_BUF_SIZE,
+                                       xid,
+                                       NULL,
+                                       DRB_configList2,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       dedicatedNAS_MessageList,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL);
   LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)buffer, size, "[MSG] RRC Reconfiguration\n");
 
   /* Free all NAS PDUs */
@@ -1083,9 +1118,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
     uint8_t                 *nas_buffer)
 //-----------------------------------------------------------------------------
 {
-  uint8_t                             buffer[RRC_BUF_SIZE];
   int                                 i;
-  uint16_t                            size  = 0;
   NR_DRB_ToReleaseList_t             **DRB_Release_configList2 = NULL;
   NR_DRB_Identity_t                  *DRB_release;
   struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList
@@ -1120,13 +1153,15 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
     LOG_W(NR_RRC,"dedlicated NAS list is empty\n");
   }
 
-  memset(buffer, 0, sizeof(buffer));
-  size = do_RRCReconfiguration(ctxt_pP, buffer, sizeof(buffer), xid, NULL, NULL, *DRB_Release_configList2, NULL, NULL, NULL, dedicatedNAS_MessageList, NULL, NULL, NULL, NULL, NULL);
+  uint8_t buffer[RRC_BUF_SIZE] = {0};
+  int size = do_RRCReconfiguration(ctxt_pP, buffer, RRC_BUF_SIZE, xid, NULL, NULL, *DRB_Release_configList2, NULL, NULL, NULL, dedicatedNAS_MessageList, NULL, NULL, NULL, NULL, NULL);
 
   ue_context_pP->ue_context.pdu_session_release_command_flag = 1;
 
   LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size, "[MSG] RRC Reconfiguration\n");
 
+  ue_context_pP->ue_context.pdu_session_release_command_flag = 1;
+
   /* Free all NAS PDUs */
   if (nas_length > 0) {
     /* Free the NAS PDU buffer and invalidate it */
@@ -1174,6 +1209,10 @@ rrc_gNB_process_RRCReconfigurationComplete(
 )
 {
   int                                 drb_id;
+  uint8_t                            *kRRCenc = NULL;
+  uint8_t                            *kRRCint = NULL;
+  uint8_t                            *kUPenc = NULL;
+  uint8_t                            *kUPint = NULL;
   NR_DRB_ToAddModList_t              *DRB_configList = ue_context_pP->ue_context.DRB_configList2[xid];
   NR_SRB_ToAddModList_t              *SRB_configList = ue_context_pP->ue_context.SRB_configList2[xid];
   NR_DRB_ToReleaseList_t             *DRB_Release_configList2 = ue_context_pP->ue_context.DRB_Release_configList2[xid];
@@ -1182,9 +1221,55 @@ rrc_gNB_process_RRCReconfigurationComplete(
 
   ue_context_pP->ue_context.ue_reestablishment_timer = 0;
 
+  /* Derive the keys from kgnb */
+  if (DRB_configList != NULL) {
+    nr_derive_key_up_enc(ue_context_pP->ue_context.ciphering_algorithm,
+                         ue_context_pP->ue_context.kgnb,
+                         &kUPenc);
+    nr_derive_key_up_int(ue_context_pP->ue_context.integrity_algorithm,
+                         ue_context_pP->ue_context.kgnb,
+                         &kUPint);
+  }
+
+  nr_derive_key_rrc_enc(ue_context_pP->ue_context.ciphering_algorithm,
+                        ue_context_pP->ue_context.kgnb,
+                        &kRRCenc);
+  nr_derive_key_rrc_int(ue_context_pP->ue_context.integrity_algorithm,
+                        ue_context_pP->ue_context.kgnb,
+                        &kRRCint);
+  /* Refresh SRBs/DRBs */
+
+  LOG_D(NR_RRC, "Configuring PDCP DRBs/SRBs for UE %04x\n", ue_context_pP->ue_context.rnti);
+
+  ue_id_t reestablish_ue_id = 0;
+  if (DRB_configList && DRB_configList->list.array[0]->reestablishPDCP && *DRB_configList->list.array[0]->reestablishPDCP == NR_DRB_ToAddMod__reestablishPDCP_true) {
+    for (int i = 0; i < MAX_MOBILES_PER_GNB; i++) {
+      nr_reestablish_rnti_map_t *nr_reestablish_rnti_map = &(RC.nrrrc[ctxt_pP->module_id])->nr_reestablish_rnti_map[i];
+      if (nr_reestablish_rnti_map->ue_id == ctxt_pP->rntiMaybeUEid) {
+        reestablish_ue_id = nr_reestablish_rnti_map[i].c_rnti;
+        LOG_D(NR_RRC, "Removing reestablish_rnti_map[%d] UEid %lx, RNTI %04x\n", i, nr_reestablish_rnti_map->ue_id, nr_reestablish_rnti_map->c_rnti);
+        // clear current C-RNTI from map
+        nr_reestablish_rnti_map->ue_id = 0;
+        nr_reestablish_rnti_map->c_rnti = 0;
+        break;
+      }
+    }
+  }
+
+  nr_pdcp_add_srbs(ctxt_pP->enb_flag, ctxt_pP->rntiMaybeUEid, SRB_configList, (ue_context_pP->ue_context.integrity_algorithm << 4) | ue_context_pP->ue_context.ciphering_algorithm, kRRCenc, kRRCint);
+
+  nr_pdcp_add_drbs(ctxt_pP->enb_flag,
+                   ctxt_pP->rntiMaybeUEid,
+                   reestablish_ue_id,
+                   DRB_configList,
+                   (ue_context_pP->ue_context.integrity_algorithm << 4) | ue_context_pP->ue_context.ciphering_algorithm,
+                   kUPenc,
+                   kUPint,
+                   get_softmodem_params()->sa ? ue_context_pP->ue_context.masterCellGroup->rlc_BearerToAddModList : NULL);
+
   /* Refresh SRBs/DRBs */
   if (!NODE_IS_CU(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
-    LOG_D(NR_RRC,"Configuring RLC DRBs/SRBs for UE %x\n",ue_context_pP->ue_context.rnti);
+    LOG_D(NR_RRC,"Configuring RLC DRBs/SRBs for UE %04x\n",ue_context_pP->ue_context.rnti);
     nr_rrc_rlc_config_asn1_req(ctxt_pP,
                                SRB_configList, // NULL,
                                DRB_configList,
@@ -1201,12 +1286,12 @@ rrc_gNB_process_RRCReconfigurationComplete(
       } else if (SRB_configList->list.array[i]->srb_Identity == 2) {
         ue_context_pP->ue_context.Srb2.Active = 1;
         ue_context_pP->ue_context.Srb2.Srb_info.Srb_id = 2;
-        LOG_I(NR_RRC,"[gNB %d] Frame      %d CC %d : SRB2 is now active\n",
+        LOG_I(NR_RRC,"[gNB %d] Frame %d CC %d: SRB2 is now active\n",
               ctxt_pP->module_id,
               ctxt_pP->frame,
               ue_context_pP->ue_context.primaryCC_id);
       } else {
-        LOG_W(NR_RRC,"[gNB %d] Frame      %d CC %d : invalide SRB identity %ld\n",
+        LOG_W(NR_RRC,"[gNB %d] Frame %d CC %d: invalid SRB identity %ld\n",
               ctxt_pP->module_id,
               ctxt_pP->frame,
               ue_context_pP->ue_context.primaryCC_id,
@@ -1231,8 +1316,8 @@ rrc_gNB_process_RRCReconfigurationComplete(
               (int)DRB_configList->list.array[i]->drb_Identity);
         //(int)*DRB_configList->list.array[i]->pdcp_Config->moreThanOneRLC->primaryPath.logicalChannel);
 
-        if (ue_context_pP->ue_context.DRB_active[drb_id] == 0) {
-          ue_context_pP->ue_context.DRB_active[drb_id] = 1;
+        if (ue_context_pP->ue_context.DRB_active[drb_id - 1] == 0) {
+          ue_context_pP->ue_context.DRB_active[drb_id - 1] = DRB_ACTIVE;
           LOG_D(NR_RRC, "[gNB %d] Frame %d: Establish RLC UM Bidirectional, DRB %d Active\n",
                   ctxt_pP->module_id, ctxt_pP->frame, (int)DRB_configList->list.array[i]->drb_Identity);
 
@@ -1245,7 +1330,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
           //}
 
             // rrc_mac_config_req_eNB
-        } else {        // remove LCHAN from MAC/PHY
+        } else { // remove LCHAN from MAC/PHY
           if (ue_context_pP->ue_context.DRB_active[drb_id] == 1) {
             /* TODO : It may be needed if gNB goes into full stack working. */
             // DRB has just been removed so remove RLC + PDCP for DRB
@@ -1259,7 +1344,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
                                 nr_DRB2LCHAN[i]);*/
           }
 
-          ue_context_pP->ue_context.DRB_active[drb_id] = 0;
+          //ue_context_pP->ue_context.DRB_active[drb_id] = 0;
           LOG_D(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" RRC_eNB --- MAC_CONFIG_REQ  (DRB) ---> MAC_eNB\n",
                   PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
 
@@ -1291,87 +1376,105 @@ rrc_gNB_process_RRCReconfigurationComplete(
 }
 
 //-----------------------------------------------------------------------------
-void
-rrc_gNB_generate_RRCReestablishment(
-  const protocol_ctxt_t *const ctxt_pP,
-  rrc_gNB_ue_context_t  *const ue_context_pP,
-  const int             CC_id)
+void rrc_gNB_generate_RRCReestablishment(const protocol_ctxt_t *ctxt_pP,
+                                         rrc_gNB_ue_context_t *ue_context_pP,
+                                         const uint8_t *masterCellGroup_from_DU,
+                                         NR_ServingCellConfigCommon_t *scc,
+                                         const int CC_id)
 //-----------------------------------------------------------------------------
 {
-    // int UE_id = -1;
-    //NR_LogicalChannelConfig_t  *SRB1_logicalChannelConfig = NULL;
-    NR_SRB_ToAddModList_t      **SRB_configList;
-    // NR_SRB_ToAddMod_t          *SRB1_config = NULL;
-    //rrc_gNB_carrier_data_t     *carrier = NULL;
-    gNB_RRC_UE_t               *ue_context = NULL;
-    module_id_t                 module_id = ctxt_pP->module_id;
-    // uint16_t                    rnti = ctxt_pP->rnti;
-    gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
-    
-    SRB_configList = &(ue_context_pP->ue_context.SRB_configList);
-    //carrier = &(RC.nrrrc[ctxt_pP->module_id]->carrier);
-    ue_context = &(ue_context_pP->ue_context);
-    unsigned char buf[1024];
-    int size = do_RRCReestablishment(ctxt_pP,
-        ue_context_pP,
-        CC_id,
-        buf,
-        sizeof(buf),
-        //(uint8_t) carrier->p_gNB, // at this point we do not have the UE capability information, so it can only be TM1 or TM2
-        rrc_gNB_get_next_transaction_identifier(module_id),
-        SRB_configList
-        //&(ue_context->physicalConfigDedicated)
-        );
+  // int UE_id = -1;
+  // NR_LogicalChannelConfig_t  *SRB1_logicalChannelConfig = NULL;
+  NR_SRB_ToAddModList_t **SRB_configList;
+  // NR_SRB_ToAddMod_t          *SRB1_config = NULL;
+  // rrc_gNB_carrier_data_t     *carrier = NULL;
+  module_id_t module_id = ctxt_pP->module_id;
+  gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
+  int enable_ciphering = 0;
 
-    /* Configure SRB1 for UE */
-    if (*SRB_configList != NULL) {
-      for (int cnt = 0; cnt < (*SRB_configList)->list.count; cnt++) {
-        if ((*SRB_configList)->list.array[cnt]->srb_Identity == 1) {
-          // SRB1_config = (*SRB_configList)->list.array[cnt];
-        }
+  // Need to drop spCellConfig when there is a RRCReestablishment
+  // Save spCellConfig in spCellConfigReestablishment to recover after Reestablishment is completed
+  ue_context_pP->ue_context.spCellConfigReestablishment = ue_context_pP->ue_context.masterCellGroup->spCellConfig;
+  ue_context_pP->ue_context.masterCellGroup->spCellConfig = NULL;
 
-        LOG_D(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" RRC_gNB --- MAC_CONFIG_REQ  (SRB1) ---> MAC_gNB\n",
-              PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
+  SRB_configList = &(ue_context_pP->ue_context.SRB_configList);
 
-        // rrc_mac_config_req_eNB
-      }
-    }  // if (*SRB_configList != NULL)
-    
-    LOG_I(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-DCCH, Generating NR_RRCReestablishment (bytes %d)\n",
-          PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
-          size);
-#if(0)
-    /* TODO : It may be needed if gNB goes into full stack working. */
-    UE = find_nr_UE(module_id, rnti);
-    if (UE_id != -1) {
-      /* Activate reject timer, if RRCComplete not received after 10 frames, reject UE */
-      RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 1;
-      /* Reject UE after 10 frames, LTE_RRCConnectionReestablishmentReject is triggered */
-      RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer_thres = 100;
-    } else {
-      LOG_E(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" Generating NR_RRCReestablishment without UE_id(MAC) rnti %x\n",
-            PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
-            rnti);
-    }
+  uint8_t buffer[RRC_BUF_SIZE] = {0};
+  int size = do_RRCReestablishment(ctxt_pP,
+                                       ue_context_pP,
+                                       CC_id,
+                                       buffer,
+                                       RRC_BUF_SIZE,
+                                       rrc_gNB_get_next_transaction_identifier(module_id),
+                                       SRB_configList,
+                                       masterCellGroup_from_DU,
+                                       scc,
+                                       &rrc->carrier);
+
+  LOG_I(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT " [RAPROC] Logical Channel DL-DCCH, Generating NR_RRCReestablishment (bytes %d)\n", PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP), size);
+#if (0)
+  /* TODO : It may be needed if gNB goes into full stack working. */
+  UE = find_nr_UE(module_id, rnti);
+  if (UE_id != -1) {
+    /* Activate reject timer, if RRCComplete not received after 10 frames, reject UE */
+    RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 1;
+    /* Reject UE after 10 frames, NR_RRCReestablishmentReject is triggered */
+    RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer_thres = 100;
+  } else {
+    LOG_E(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT " Generating NR_RRCReestablishment without UE_id(MAC) rnti %x\n", PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP), rnti);
+  }
 #endif
 
-  /* correct? specs say RRCReestablishment goes through srb1... */
-  f1ap_dl_rrc_message_t dl_rrc = {
-    .old_gNB_DU_ue_id = 0xFFFFFF,
-    .rrc_container = buf,
-    .rrc_container_length = size,
-    .rnti = ue_context->rnti,
-    .srb_id = CCCH
-  };
-  rrc->mac_rrc.dl_rrc_message_transfer(ctxt_pP->module_id, &dl_rrc);
+  uint8_t *kRRCenc = NULL;
+  uint8_t *kRRCint = NULL;
+  uint8_t *kUPenc = NULL;
+  /* Derive the keys from kgnb */
+  if (SRB_configList != NULL) {
+    nr_derive_key_up_enc(ue_context_pP->ue_context.ciphering_algorithm, ue_context_pP->ue_context.kgnb, &kUPenc);
+  }
+
+  nr_derive_key_rrc_enc(ue_context_pP->ue_context.ciphering_algorithm, ue_context_pP->ue_context.kgnb, &kRRCenc);
+  nr_derive_key_rrc_int(ue_context_pP->ue_context.integrity_algorithm, ue_context_pP->ue_context.kgnb, &kRRCint);
+
+  /* Configure SRB1 for UE */
+  if (*SRB_configList != NULL) {
+    for (int cnt = 0; cnt < (*SRB_configList)->list.count; cnt++) {
+      if ((*SRB_configList)->list.array[cnt]->srb_Identity == 1) {
+        nr_pdcp_add_srbs(ctxt_pP->enb_flag,
+                         ctxt_pP->rntiMaybeUEid,
+                         *SRB_configList,
+                         0,
+                         NULL,
+                         NULL);
+      }
+      LOG_D(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT " RRC_gNB --- MAC_CONFIG_REQ  (SRB1) ---> MAC_gNB\n", PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
+    }
+  } // if (*SRB_configList != NULL)
+
+  LOG_I(NR_RRC, "Set PDCP security RNTI %04lx nca %ld nia %d in RRCReestablishment\n", ctxt_pP->rntiMaybeUEid, ue_context_pP->ue_context.ciphering_algorithm, ue_context_pP->ue_context.integrity_algorithm);
+  pdcp_config_set_security(
+      ctxt_pP,
+      NULL, /* pdcp_pP not used anymore in NR */
+      DCCH,
+      DCCH + 2,
+      enable_ciphering ? ue_context_pP->ue_context.ciphering_algorithm | (ue_context_pP->ue_context.integrity_algorithm << 4) : 0 | (ue_context_pP->ue_context.integrity_algorithm << 4),
+      kRRCenc,
+      kRRCint,
+      kUPenc);
+
+  if (!NODE_IS_CU(rrc->node_type)) {
+    apply_macrlc_config_reest(rrc, ue_context_pP, ctxt_pP, ctxt_pP->rntiMaybeUEid);
+  }
+
+  nr_rrc_data_req(ctxt_pP, DCCH, rrc_gNB_mui++, SDU_CONFIRM_NO, size, buffer, PDCP_TRANSMISSION_MODE_CONTROL);
 }
 
 //-----------------------------------------------------------------------------
-void rrc_gNB_process_RRCConnectionReestablishmentComplete(const protocol_ctxt_t *const ctxt_pP, const rnti_t reestablish_rnti, rrc_gNB_ue_context_t *ue_context_pP, const uint8_t old_xid)
+void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *const ctxt_pP, const rnti_t reestablish_rnti, rrc_gNB_ue_context_t *ue_context_pP, const uint8_t xid)
 //-----------------------------------------------------------------------------
 {
   LOG_I(NR_RRC,
-        PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel UL-DCCH, processing NR_RRCConnectionReestablishmentComplete from UE (SRB1 Active)\n",
+        PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel UL-DCCH, processing NR_RRCReestablishmentComplete from UE (SRB1 Active)\n",
         PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
 
   NR_DRB_ToAddModList_t                 *DRB_configList = ue_context_pP->ue_context.DRB_configList;
@@ -1382,15 +1485,13 @@ void rrc_gNB_process_RRCConnectionReestablishmentComplete(const protocol_ctxt_t
   NR_DRB_ToAddMod_t                     *DRB_config      = NULL;
   //NR_SDAP_Config_t                      *sdap_config     = NULL;
   int i = 0;
-  uint8_t                             buffer[RRC_BUF_SIZE];
-  uint16_t                            size;
 
   uint8_t new_xid = rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id);
   int ret = 0;
   ue_context_pP->ue_context.StatusRrc = NR_RRC_CONNECTED;
   ue_context_pP->ue_context.ue_rrc_inactivity_timer = 1; // set rrc inactivity when UE goes into RRC_CONNECTED
   ue_context_pP->ue_context.reestablishment_xid = new_xid;
-  SRB_configList2 = &ue_context_pP->ue_context.SRB_configList2[old_xid];
+  SRB_configList2 = &ue_context_pP->ue_context.SRB_configList2[xid];
 
   // get old configuration of SRB2
   if (*SRB_configList2 != NULL) {
@@ -1401,8 +1502,10 @@ void rrc_gNB_process_RRCConnectionReestablishmentComplete(const protocol_ctxt_t
 
     for (i = 0; (i < (*SRB_configList2)->list.count) && (i < 3); i++) {
       if ((*SRB_configList2)->list.array[i]->srb_Identity == 2 ) {
-        LOG_D(NR_RRC, "get SRB2_config from (ue_context_pP->ue_context.SRB_configList2[%d])\n", old_xid);
+        LOG_D(NR_RRC, "get SRB2_config from (ue_context_pP->ue_context.SRB_configList2[%d])\n", xid);
         SRB2_config = (*SRB_configList2)->list.array[i];
+        SRB2_config->reestablishPDCP = CALLOC(1, sizeof(*SRB2_config->reestablishPDCP));
+        *SRB2_config->reestablishPDCP = NR_SRB_ToAddMod__reestablishPDCP_true;
         break;
       }
     }
@@ -1445,6 +1548,7 @@ void rrc_gNB_process_RRCConnectionReestablishmentComplete(const protocol_ctxt_t
 
     for (i = 0; (i < DRB_configList->list.count) && (i < 3); i++) {
       DRB_config = DRB_configList->list.array[i];
+      asn1cCallocOne(DRB_config->reestablishPDCP, NR_DRB_ToAddMod__reestablishPDCP_true);
       // Add DRB to DRB configuration list, for LTE_RRCConnectionReconfigurationComplete
       asn1cSeqAdd(&(*DRB_configList2)->list, DRB_config);
     }
@@ -1530,9 +1634,10 @@ void rrc_gNB_process_RRCConnectionReestablishmentComplete(const protocol_ctxt_t
       ue_context_pP->ue_context.ul_failure_timer = 0;
       return;
     }
-  } 
+  }
 
   /* Update RNTI in ue_context */
+  LOG_I(NR_RRC, "Updating UEid from %04x to %lx\n", ue_context_pP->ue_context.rnti, ctxt_pP->rntiMaybeUEid);
   ue_context_pP->ue_id_rnti = ctxt_pP->rntiMaybeUEid; // here ue_id_rnti is just a key, may be something else
   ue_context_pP->ue_context.rnti = ctxt_pP->rntiMaybeUEid;
 
@@ -1545,35 +1650,54 @@ void rrc_gNB_process_RRCConnectionReestablishmentComplete(const protocol_ctxt_t
     LOG_D(NR_RRC, "set security successfully \n");
   }
 
+  uint8_t drb_id_to_setup_start = DRB_configList ? DRB_configList->list.array[0]->drb_Identity : 1;
+  uint8_t nb_drb_to_setup = DRB_configList ? DRB_configList->list.count : ue_context_pP->ue_context.nb_of_pdusessions;
+  /* TODO: hardcoded to 13 for the time being, to be changed? */
+  long drb_priority[NGAP_MAX_DRBS_PER_UE] = {13};
+
   /* Add all NAS PDUs to the list */
   for (i = 0; i < ue_context_pP->ue_context.nb_of_pdusessions; i++) {
 
     /* TODO parameters yet to process ... */
     /* TODO should test if pdu session are Ok before! */
     ue_context_pP->ue_context.pduSession[i].status = PDU_SESSION_STATUS_DONE;
-    ue_context_pP->ue_context.pduSession[i].xid = old_xid;
+    ue_context_pP->ue_context.pduSession[i].xid = xid;
     LOG_D(NR_RRC, "setting the status for the default DRB (index %d) to (%d,%s)\n",
           i, ue_context_pP->ue_context.pduSession[i].status, "PDU_SESSION_STATUS_DONE");
   }
 
-  memset(buffer, 0, sizeof(buffer));
+  gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
+  NR_CellGroupConfig_t *cellGroupConfig = calloc(1, sizeof(NR_CellGroupConfig_t));
 
-  size = do_RRCReconfiguration(ctxt_pP,
-                               buffer,
-                               sizeof(buffer),
-                               old_xid,
-                               *SRB_configList2,
-                               DRB_configList,
-                               NULL,
-                               NULL,
-                               NULL,
-                               NULL, // MeasObj_list,
-                               NULL,
-                               NULL,
-                               NULL,
-                               NULL,
-                               NULL,
-                               NULL);
+  // Revert spCellConfig stored in spCellConfigReestablishment before had been dropped during RRC Reestablishment
+  ue_context_pP->ue_context.masterCellGroup->spCellConfig = ue_context_pP->ue_context.spCellConfigReestablishment;
+  ue_context_pP->ue_context.spCellConfigReestablishment = NULL;
+  cellGroupConfig->spCellConfig = ue_context_pP->ue_context.masterCellGroup->spCellConfig;
+
+  fill_mastercellGroupConfig(cellGroupConfig, ue_context_pP->ue_context.masterCellGroup, rrc->um_on_default_drb, (drb_id_to_setup_start < 2) ? 1 : 0, drb_id_to_setup_start, nb_drb_to_setup, drb_priority);
+
+  for(i = 0; i < cellGroupConfig->rlc_BearerToAddModList->list.count; i++) {
+    cellGroupConfig->rlc_BearerToAddModList->list.array[i]->reestablishRLC = CALLOC(1, sizeof(*cellGroupConfig->rlc_BearerToAddModList->list.array[i]->reestablishRLC));
+    *cellGroupConfig->rlc_BearerToAddModList->list.array[i]->reestablishRLC = NR_RLC_BearerConfig__reestablishRLC_true;
+  }
+
+  uint8_t buffer[RRC_BUF_SIZE] = {0};
+  int size = do_RRCReconfiguration(ctxt_pP,
+                                       buffer,
+                                       RRC_BUF_SIZE,
+                                       new_xid,
+                                       *SRB_configList2,
+                                       DRB_configList,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL, // MeasObj_list,
+                                       NULL,
+                                       ue_context_pP,
+                                       &rrc->carrier,
+                                       NULL,
+                                       NULL,
+                                       cellGroupConfig);
 
   LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size, "[MSG] RRC Reconfiguration\n");
 
@@ -1586,24 +1710,35 @@ void rrc_gNB_process_RRCConnectionReestablishmentComplete(const protocol_ctxt_t
     }
   }
 
-  if(size==65535) {
-    LOG_E(NR_RRC,"RRC decode err!!! do_RRCReconfiguration\n");
+  if (size < 0) {
+    LOG_E(NR_RRC, "RRC decode err!!! do_RRCReconfiguration\n");
     return;
   } else {
-    LOG_I(NR_RRC,
-          "[gNB %d] Frame %d, Logical Channel DL-DCCH, Generate NR_RRCConnectionReconfiguration (bytes %d, UE id %x)\n",
-          ctxt_pP->module_id, ctxt_pP->frame, size, ue_context_pP->ue_context.rnti);
+    LOG_I(NR_RRC, "[gNB %d] Frame %d, Logical Channel DL-DCCH, Generate NR_RRCReconfiguration (bytes %d, UE id %04x)\n", ctxt_pP->module_id, ctxt_pP->frame, size, ue_context_pP->ue_context.rnti);
     LOG_D(NR_RRC,
-          "[FRAME %05d][RRC_gNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
-          ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_gNB_mui, ctxt_pP->module_id, DCCH);
-    nr_rrc_data_req(
-      ctxt_pP,
-      DCCH,
-      rrc_gNB_mui++,
-      SDU_CONFIRM_NO,
-      size,
-      buffer,
-      PDCP_TRANSMISSION_MODE_CONTROL);
+          "[FRAME %05d][RRC_gNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (RRCReconfiguration to UE %04x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
+          ctxt_pP->frame,
+          ctxt_pP->module_id,
+          size,
+          ue_context_pP->ue_context.rnti,
+          rrc_gNB_mui,
+          ctxt_pP->module_id,
+          DCCH);
+
+    gNB_RrcConfigurationReq *configuration = &RC.nrrrc[ctxt_pP->module_id]->configuration;
+    rrc_mac_config_req_gNB(ctxt_pP->module_id,
+                           configuration->pdsch_AntennaPorts,
+                           configuration->pusch_AntennaPorts,
+                           configuration->sib1_tda,
+                           configuration->minRXTXTIME,
+                           NULL,
+                           NULL,
+                           NULL,
+                           0,
+                           ue_context_pP->ue_context.rnti,
+                           cellGroupConfig);
+
+    nr_rrc_data_req(ctxt_pP, DCCH, rrc_gNB_mui++, SDU_CONFIRM_NO, size, buffer, PDCP_TRANSMISSION_MODE_CONTROL);
   }
 
   if (NODE_IS_DU(RC.nrrrc[ctxt_pP->module_id]->node_type) || NODE_IS_MONOLITHIC(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
@@ -1626,8 +1761,6 @@ int nr_rrc_reconfiguration_req(rrc_gNB_ue_context_t         *const ue_context_pP
                                const int                    dl_bwp_id,
                                const int                    ul_bwp_id) {
 
-  uint8_t buffer[RRC_BUF_SIZE];
-  memset(buffer, 0, sizeof(buffer));
   uint8_t xid = rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id);
 
   NR_CellGroupConfig_t *masterCellGroup = ue_context_pP->ue_context.masterCellGroup;
@@ -1639,22 +1772,23 @@ int nr_rrc_reconfiguration_req(rrc_gNB_ue_context_t         *const ue_context_pP
     *masterCellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id = ul_bwp_id;
   }
 
-  uint16_t  size = do_RRCReconfiguration(ctxt_pP,
-                                         buffer,
-                                         sizeof(buffer),
-                                         xid,
-                                         NULL,
-                                         NULL,
-                                         NULL,
-                                         NULL,
-                                         NULL,
-                                         NULL,
-                                         NULL,
-                                         ue_context_pP,
-                                         NULL,
-                                         NULL,
-                                         NULL,
-                                         masterCellGroup);
+  uint8_t buffer[RRC_BUF_SIZE];
+  int size = do_RRCReconfiguration(ctxt_pP,
+                                       buffer,
+                                       RRC_BUF_SIZE,
+                                       xid,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       ue_context_pP,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       masterCellGroup);
 
   gNB_RrcConfigurationReq *configuration = &RC.nrrrc[ctxt_pP->module_id]->configuration;
   rrc_mac_config_req_gNB(ctxt_pP->module_id,
@@ -1836,160 +1970,131 @@ int nr_rrc_gNB_decode_ccch(protocol_ctxt_t    *const ctxt_pP,
                 LOG_I(NR_RRC, "receive rrcResumeRequest message \n");
         break;
 
-      case NR_UL_CCCH_MessageType__c1_PR_rrcReestablishmentRequest:
-        LOG_I(NR_RRC, "receive rrcReestablishmentRequest message \n");
-        LOG_DUMPMSG(NR_RRC, DEBUG_RRC,(char *)(buffer), buffer_length,
-              "[MSG] RRC Reestablishment Request\n");
-        LOG_D(NR_RRC,
-              PROTOCOL_NR_RRC_CTXT_UE_FMT"MAC_gNB--- MAC_DATA_IND (rrcReestablishmentRequest on SRB0) --> RRC_gNB\n",
-              PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
+      case NR_UL_CCCH_MessageType__c1_PR_rrcReestablishmentRequest: {
+        LOG_I(NR_RRC, "Received rrcReestablishmentRequest message\n");
+        LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)(buffer), buffer_length, "[MSG] RRC Reestablishment Request\n");
+        LOG_D(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT "MAC_gNB--- MAC_DATA_IND (rrcReestablishmentRequest on SRB0) --> RRC_gNB\n", PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
 
         rrcReestablishmentRequest = ul_ccch_msg->message.choice.c1->choice.rrcReestablishmentRequest->rrcReestablishmentRequest;
         LOG_I(NR_RRC,
-          PROTOCOL_NR_RRC_CTXT_UE_FMT" NR_RRCReestablishmentRequest cause %s\n",
-          PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
-          ((rrcReestablishmentRequest.reestablishmentCause == NR_ReestablishmentCause_otherFailure) ?   "Other Failure" :
-          (rrcReestablishmentRequest.reestablishmentCause == NR_ReestablishmentCause_handoverFailure) ? "Handover Failure" :
-          "reconfigurationFailure"));
-        {
-          uint16_t                          c_rnti = 0;
-          if (rrcReestablishmentRequest.ue_Identity.physCellId != RC.nrrrc[ctxt_pP->module_id]->carrier.physCellId) {
-            /* UE was moving from previous cell so quickly that RRCReestablishment for previous cell was recieved in this cell */
-            LOG_E(NR_RRC,
-                  PROTOCOL_NR_RRC_CTXT_UE_FMT" NR_RRCReestablishmentRequest ue_Identity.physCellId(%ld) is not equal to current physCellId(%d), fallback to RRC establishment\n",
-                  PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
-                  rrcReestablishmentRequest.ue_Identity.physCellId,
-                  RC.nrrrc[ctxt_pP->module_id]->carrier.physCellId);
-            rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
-            break;
-          }
+              PROTOCOL_NR_RRC_CTXT_UE_FMT " NR_RRCReestablishmentRequest cause %s\n",
+              PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
+              ((rrcReestablishmentRequest.reestablishmentCause == NR_ReestablishmentCause_otherFailure)      ? "Other Failure"
+               : (rrcReestablishmentRequest.reestablishmentCause == NR_ReestablishmentCause_handoverFailure) ? "Handover Failure"
+                                                                                                             : "reconfigurationFailure"));
 
-          LOG_D(NR_RRC, "physCellId is %ld\n", rrcReestablishmentRequest.ue_Identity.physCellId);
-
-          for (int i = 0; i < rrcReestablishmentRequest.ue_Identity.shortMAC_I.size; i++) {
-            LOG_D(NR_RRC, "rrcReestablishmentRequest.ue_Identity.shortMAC_I.buf[%d] = %x\n",
-                  i, rrcReestablishmentRequest.ue_Identity.shortMAC_I.buf[i]);
-          }
-
-          if (rrcReestablishmentRequest.ue_Identity.c_RNTI < 0 ||
-              rrcReestablishmentRequest.ue_Identity.c_RNTI > 65535) {
-            /* c_RNTI range error should not happen */
-            LOG_E(NR_RRC,
-                  PROTOCOL_NR_RRC_CTXT_UE_FMT" NR_RRCReestablishmentRequest c_RNTI range error, fallback to RRC establishment\n",
-                  PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
-            rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
-            break;
-          }
-
-          c_rnti = rrcReestablishmentRequest.ue_Identity.c_RNTI;
-          LOG_I(NR_RRC, "c_rnti is %x\n", c_rnti);
-          ue_context_p = rrc_gNB_get_ue_context(gnb_rrc_inst, c_rnti);
-
-          if (ue_context_p == NULL) {
-            LOG_E(NR_RRC,
-                  PROTOCOL_NR_RRC_CTXT_UE_FMT" NR_RRCReestablishmentRequest without UE context, fallback to RRC establishment\n",
-                  PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
-            rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
-            break;
-          }
-#if(0)
-          /* TODO : It may be needed if gNB goes into full stack working. */
-          int UE_id = find_nr_UE_id(ctxt_pP->module_id, c_rnti);
-
-          if(UE_id == -1) {
-            LOG_E(NR_RRC,
-                  PROTOCOL_NR_RRC_CTXT_UE_FMT" NR_RRCReestablishmentRequest without UE_id(MAC) rnti %x, fallback to RRC establishment\n",
-                  PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),c_rnti);
-            rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
-            break;
-          }
-
-          //previous rnti
-          rnti_t previous_rnti = 0;
-
-          for (int i = 0; i < MAX_MOBILES_PER_ENB; i++) {
-            if (reestablish_rnti_map[i][1] == c_rnti) {
-              previous_rnti = reestablish_rnti_map[i][0];
-              break;
-            }
-          }
-
-          if(previous_rnti != 0) {
-            UE_id = find_nr_UE_id(ctxt_pP->module_id, previous_rnti);
-
-            if(UE_id == -1) {
-              LOG_E(NR_RRC,
-                    PROTOCOL_NR_RRC_CTXT_UE_FMT" RRCReestablishmentRequest without UE_id(MAC) previous rnti %x, fallback to RRC establishment\n",
-                    PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),previous_rnti);
-              rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
-              break;
-            }
-          }
-#endif
-          //c-plane not end
-          if((ue_context_p->ue_context.StatusRrc != NR_RRC_RECONFIGURED) && (ue_context_p->ue_context.reestablishment_cause == NR_ReestablishmentCause_spare1)) {
-            LOG_E(NR_RRC,
-                  PROTOCOL_NR_RRC_CTXT_UE_FMT" NR_RRCReestablishmentRequest (UE %x c-plane is not end), RRC establishment failed \n",
-                  PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),c_rnti);
-            /* TODO RRC Release ? */
-            break;
-          }
-
-          if(ue_context_p->ue_context.ue_reestablishment_timer > 0) {
-            LOG_E(NR_RRC,
-                  PROTOCOL_NR_RRC_CTXT_UE_FMT" RRRCReconfigurationComplete(Previous) don't receive, delete the Previous UE,\nprevious Status %d, new Status NR_RRC_RECONFIGURED\n",
-                  PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
-                  ue_context_p->ue_context.StatusRrc
-                  );
-            ue_context_p->ue_context.StatusRrc = NR_RRC_RECONFIGURED;
-            protocol_ctxt_t  ctxt_old_p;
-            PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt_old_p,
-                                          ctxt_pP->instance,
-                                          GNB_FLAG_YES,
-                                          c_rnti,
-                                          ctxt_pP->frame,
-                                          ctxt_pP->subframe);
-            rrc_gNB_process_RRCReconfigurationComplete(&ctxt_old_p,
-                ue_context_p,
-                ue_context_p->ue_context.reestablishment_xid);
-
-            for (uint8_t pdusessionid = 0; pdusessionid < ue_context_p->ue_context.nb_of_pdusessions; pdusessionid++) {
-              if (ue_context_p->ue_context.pduSession[pdusessionid].status == PDU_SESSION_STATUS_DONE) {
-                ue_context_p->ue_context.pduSession[pdusessionid].status = PDU_SESSION_STATUS_ESTABLISHED;
-              } else {
-                ue_context_p->ue_context.pduSession[pdusessionid].status = PDU_SESSION_STATUS_FAILED;
-              }
-            }
-          }
-
-          LOG_D(NR_RRC,
-                PROTOCOL_NR_RRC_CTXT_UE_FMT" UE context: %p\n",
-                PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
-                ue_context_p);
-          /* reset timers */
-          ue_context_p->ue_context.ul_failure_timer = 0;
-          ue_context_p->ue_context.ue_release_timer = 0;
-          ue_context_p->ue_context.ue_reestablishment_timer = 0;
-          // ue_context_p->ue_context.ue_release_timer_s1 = 0;
-          ue_context_p->ue_context.ue_release_timer_rrc = 0;
-          ue_context_p->ue_context.reestablishment_xid = -1;
-
-          // insert C-RNTI to map
-          for (int i = 0; i < MAX_MOBILES_PER_ENB; i++) {
-            if (reestablish_rnti_map[i][0] == 0) {
-              reestablish_rnti_map[i][0] = ctxt_pP->rntiMaybeUEid;
-              reestablish_rnti_map[i][1] = c_rnti;
-              LOG_D(NR_RRC, "reestablish_rnti_map[%d] [0] %x, [1] %x\n",
-                    i, reestablish_rnti_map[i][0], reestablish_rnti_map[i][1]);
-              break;
-            }
-          }
-
-          ue_context_p->ue_context.reestablishment_cause = rrcReestablishmentRequest.reestablishmentCause;
-          LOG_D(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" Accept reestablishment request from UE physCellId %ld cause %ld\n",
+        if (rrcReestablishmentRequest.ue_Identity.physCellId != RC.nrrrc[ctxt_pP->module_id]->carrier.physCellId) {
+          /* UE was moving from previous cell so quickly that RRCReestablishment for previous cell was received in this cell */
+          LOG_E(NR_RRC,
+                PROTOCOL_NR_RRC_CTXT_UE_FMT " NR_RRCReestablishmentRequest ue_Identity.physCellId(%ld) is not equal to current physCellId(%d), fallback to RRC establishment\n",
                 PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
                 rrcReestablishmentRequest.ue_Identity.physCellId,
-                ue_context_p->ue_context.reestablishment_cause);
+                RC.nrrrc[ctxt_pP->module_id]->carrier.physCellId);
+          rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
+          break;
+        }
+
+        LOG_I(NR_RRC, "physCellId: %ld\n", rrcReestablishmentRequest.ue_Identity.physCellId);
+
+        for (int i = 0; i < rrcReestablishmentRequest.ue_Identity.shortMAC_I.size; i++) {
+          LOG_D(NR_RRC, "rrcReestablishmentRequest.ue_Identity.shortMAC_I.buf[%d] = %x\n", i, rrcReestablishmentRequest.ue_Identity.shortMAC_I.buf[i]);
+        }
+
+        // 3GPP TS 38.321 version 15.13.0 Section 7.1 Table 7.1-1: RNTI values
+        if (rrcReestablishmentRequest.ue_Identity.c_RNTI < 0x1 || rrcReestablishmentRequest.ue_Identity.c_RNTI > 0xffef) {
+          /* c_RNTI range error should not happen */
+          LOG_E(NR_RRC, "NR_RRCReestablishmentRequest c_RNTI range error, fallback to RRC establishment\n");
+          rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
+          break;
+        }
+
+        rnti_t c_rnti = rrcReestablishmentRequest.ue_Identity.c_RNTI;
+        LOG_I(NR_RRC, "c_RNTI: %04x\n", c_rnti);
+        ue_context_p = rrc_gNB_get_ue_context(gnb_rrc_inst, c_rnti);
+        if (ue_context_p == NULL) {
+          LOG_E(NR_RRC, "NR_RRCReestablishmentRequest without UE context, fallback to RRC establishment\n");
+          rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
+          break;
+        }
+
+#if (0)
+        /* TODO : It may be needed if gNB goes into full stack working. */
+        int UE_id = find_nr_UE_id(ctxt_pP->module_id, c_rnti);
+
+        if (UE_id == -1) {
+          LOG_E(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT " NR_RRCReestablishmentRequest without UE_id(MAC) rnti %x, fallback to RRC establishment\n", PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP), c_rnti);
+          rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
+          break;
+        }
+
+        // previous rnti
+        rnti_t previous_rnti = 0;
+
+        for (int i = 0; i < MAX_MOBILES_PER_ENB; i++) {
+          if (reestablish_rnti_map[i][1] == c_rnti) {
+            previous_rnti = reestablish_rnti_map[i][0];
+            break;
+          }
+        }
+
+        if (previous_rnti != 0) {
+          UE_id = find_nr_UE_id(ctxt_pP->module_id, previous_rnti);
+
+          if (UE_id == -1) {
+            LOG_E(NR_RRC,
+                  PROTOCOL_NR_RRC_CTXT_UE_FMT " RRCReestablishmentRequest without UE_id(MAC) previous rnti %x, fallback to RRC establishment\n",
+                  PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
+                  previous_rnti);
+            rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(ctxt_pP, 0);
+            break;
+          }
+        }
+#endif
+        // c-plane not end
+        if ((ue_context_p->ue_context.StatusRrc != NR_RRC_RECONFIGURED) && (ue_context_p->ue_context.reestablishment_cause == NR_ReestablishmentCause_spare1)) {
+          LOG_E(NR_RRC, "NR_RRCReestablishmentRequest (UE %x c-plane is not end), RRC establishment failed\n", c_rnti);
+          /* TODO RRC Release ? */
+          break;
+        }
+
+        if (ue_context_p->ue_context.ue_reestablishment_timer > 0) {
+          LOG_E(NR_RRC, "RRRCReconfigurationComplete(Previous) don't receive, delete the Previous UE,\nprevious Status %d, new Status NR_RRC_RECONFIGURED\n", ue_context_p->ue_context.StatusRrc);
+          ue_context_p->ue_context.StatusRrc = NR_RRC_RECONFIGURED;
+          protocol_ctxt_t ctxt_old_p;
+          PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt_old_p, ctxt_pP->instance, GNB_FLAG_YES, c_rnti, ctxt_pP->frame, ctxt_pP->subframe);
+          rrc_gNB_process_RRCReconfigurationComplete(&ctxt_old_p, ue_context_p, ue_context_p->ue_context.reestablishment_xid);
+
+          for (uint8_t pdusessionid = 0; pdusessionid < ue_context_p->ue_context.nb_of_pdusessions; pdusessionid++) {
+            if (ue_context_p->ue_context.pduSession[pdusessionid].status == PDU_SESSION_STATUS_DONE) {
+              ue_context_p->ue_context.pduSession[pdusessionid].status = PDU_SESSION_STATUS_ESTABLISHED;
+            } else {
+              ue_context_p->ue_context.pduSession[pdusessionid].status = PDU_SESSION_STATUS_FAILED;
+            }
+          }
+        }
+
+        /* reset timers */
+        ue_context_p->ue_context.ul_failure_timer = 0;
+        ue_context_p->ue_context.ue_release_timer = 0;
+        ue_context_p->ue_context.ue_reestablishment_timer = 0;
+        // ue_context_p->ue_context.ue_release_timer_s1 = 0;
+        ue_context_p->ue_context.ue_release_timer_rrc = 0;
+        ue_context_p->ue_context.reestablishment_xid = -1;
+
+        // Insert C-RNTI to map
+        for (int i = 0; i < MAX_MOBILES_PER_GNB; i++) {
+          nr_reestablish_rnti_map_t *nr_reestablish_rnti_map = &(RC.nrrrc[ctxt_pP->module_id])->nr_reestablish_rnti_map[i];
+          LOG_I(NR_RRC, "Insert nr_reestablish_rnti_map[%d] UEid: %lx, RNTI: %04x\n", i, nr_reestablish_rnti_map->ue_id, nr_reestablish_rnti_map->c_rnti);
+          if (nr_reestablish_rnti_map->ue_id == 0) {
+            nr_reestablish_rnti_map->ue_id = ctxt_pP->rntiMaybeUEid;
+            nr_reestablish_rnti_map->c_rnti = c_rnti;
+            LOG_I(NR_RRC, "Insert nr_reestablish_rnti_map[%d] UEid: %lx, RNTI: %04x\n", i, nr_reestablish_rnti_map->ue_id, nr_reestablish_rnti_map->c_rnti);
+            break;
+          }
+        }
+
+        ue_context_p->ue_context.reestablishment_cause = rrcReestablishmentRequest.reestablishmentCause;
+        LOG_D(NR_RRC, "Accept RRCReestablishmentRequest from UE physCellId %ld cause %ld\n", rrcReestablishmentRequest.ue_Identity.physCellId, ue_context_p->ue_context.reestablishment_cause);
 
           ue_context_p->ue_context.primaryCC_id = 0;
           //LG COMMENT Idx = (ue_mod_idP * NB_RB_MAX) + DCCH;
@@ -2005,11 +2110,10 @@ int nr_rrc_gNB_decode_ccch(protocol_ctxt_t    *const ctxt_pP,
           rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb2.Srb_info.Lchan_desc[0]);
           rrc_init_nr_srb_param(&ue_context_p->ue_context.Srb2.Srb_info.Lchan_desc[1]);
 
-          rrc_gNB_generate_RRCReestablishment(ctxt_pP, ue_context_p, 0);
+        rrc_gNB_generate_RRCReestablishment(ctxt_pP, ue_context_p, du_to_cu_rrc_container, gnb_rrc_inst->carrier.servingcellconfigcommon, 0);
 
-          LOG_I(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT "CALLING RLC CONFIG SRB1 (rbid %d)\n", PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP), Idx);
-        }
-        break;
+        LOG_I(NR_RRC, "CALLING RLC CONFIG SRB1 (rbid %d)\n", Idx);
+      } break;
 
       case NR_UL_CCCH_MessageType__c1_PR_rrcSystemInfoRequest:
         LOG_I(NR_RRC, "receive rrcSystemInfoRequest message \n");
@@ -2178,15 +2282,17 @@ rrc_gNB_decode_dcch(
                 ue_context_p->ue_context.gnb_gtp_psi[i]  = 0;
               }
             }
-	    gtpv1u_delete_ngu_tunnel(ctxt_pP->instance, &req);
+            gtpv1u_delete_ngu_tunnel(ctxt_pP->instance, &req);
             //NGAP_PDUSESSION_RELEASE_RESPONSE
             rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE(ctxt_pP, ue_context_p, xid);
           } else if (ue_context_p->ue_context.established_pdu_sessions_flag != 1) {
-            if (ue_context_p->ue_context.nb_of_pdusessions > 0) {
-              rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(ctxt_pP,
-                ue_context_p,
-                ul_dcch_msg->message.choice.c1->choice.rrcReconfigurationComplete->rrc_TransactionIdentifier);
-              ue_context_p->ue_context.nb_of_pdusessions = 0;
+            if (ue_context_p->ue_context.reestablishment_xid < 0) {
+              if (ue_context_p->ue_context.nb_of_pdusessions > 0) {
+                rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(ctxt_pP, ue_context_p, ul_dcch_msg->message.choice.c1->choice.rrcReconfigurationComplete->rrc_TransactionIdentifier);
+                ue_context_p->ue_context.nb_of_pdusessions = 0;
+              }
+            } else {
+              ue_context_p->ue_context.reestablishment_xid = -1;
             }
           }
           if (ue_context_p->ue_context.nb_of_modify_pdusessions > 0) {
@@ -2528,68 +2634,61 @@ rrc_gNB_decode_dcch(
 
       break;
 
-            case NR_UL_DCCH_MessageType__c1_PR_rrcReestablishmentComplete:
-              LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)Rx_sdu,sdu_sizeP,
-                          "[MSG] NR_RRC Connection Reestablishment Complete\n");
-              LOG_I(NR_RRC,
-                    PROTOCOL_RRC_CTXT_UE_FMT" RLC RB %02d --- RLC_DATA_IND %d bytes "
-                    "(rrcConnectionReestablishmentComplete) ---> RRC_gNB\n",
-                    PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
-                    DCCH,
-                    sdu_sizeP);
-              {
-                rnti_t reestablish_rnti = 0;
+      case NR_UL_DCCH_MessageType__c1_PR_rrcReestablishmentComplete: {
+        LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)Rx_sdu, sdu_sizeP, "[MSG] NR_RRC Connection Reestablishment Complete\n");
+        LOG_I(NR_RRC,
+              PROTOCOL_RRC_CTXT_UE_FMT
+              " RLC RB %02d --- RLC_DATA_IND %d bytes "
+              "(rrcReestablishmentComplete) ---> RRC_gNB\n",
+              PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
+              DCCH,
+              sdu_sizeP);
 
-                // select C-RNTI from map
-                for (i = 0; i < MAX_MOBILES_PER_ENB; i++) {
-                  if (reestablish_rnti_map[i][0] == ctxt_pP->rntiMaybeUEid) {
-                    reestablish_rnti = reestablish_rnti_map[i][1];
-                    ue_context_p = rrc_gNB_get_ue_context(
-                                     RC.nrrrc[ctxt_pP->module_id],
-                                     reestablish_rnti);
-                    // clear currentC-RNTI from map
-                    reestablish_rnti_map[i][0] = 0;
-                    reestablish_rnti_map[i][1] = 0;
-                    LOG_D(NR_RRC, "reestablish_rnti_map[%d] [0] %x, [1] %x\n",
-                          i, reestablish_rnti_map[i][0], reestablish_rnti_map[i][1]);
-                    break;
-                  }
-                }
+        rnti_t reestablish_rnti = 0;
 
-                if (!ue_context_p) {
-                  LOG_E(NR_RRC,
-                        PROTOCOL_NR_RRC_CTXT_UE_FMT" NR_RRCConnectionReestablishmentComplete without UE context, falt\n",
-                        PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
-                  break;
-                }
+        //  Select C-RNTI from map
+        for (i = 0; i < MAX_MOBILES_PER_GNB; i++) {
+          nr_reestablish_rnti_map_t *nr_reestablish_rnti_map = &(RC.nrrrc[ctxt_pP->module_id])->nr_reestablish_rnti_map[i];
+          LOG_I(NR_RRC, "nr_reestablish_rnti_map[%d] UEid %lx, RNTI %04x, ctxt_pP->rntiMaybeUEid: %lx\n", i, nr_reestablish_rnti_map->ue_id, nr_reestablish_rnti_map->c_rnti, ctxt_pP->rntiMaybeUEid);
+          if (nr_reestablish_rnti_map->ue_id == ctxt_pP->rntiMaybeUEid) {
+          LOG_I(NR_RRC, "Removing nr_reestablish_rnti_map[%d] UEid %lx, RNTI %04x\n", i, nr_reestablish_rnti_map->ue_id, nr_reestablish_rnti_map->c_rnti);
+          reestablish_rnti = nr_reestablish_rnti_map->c_rnti;
+          ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[ctxt_pP->module_id], reestablish_rnti);
+          break;
+          }
+        }
 
-#if(0)
-                /* TODO : It may be needed if gNB goes into full stack working. */
-                //clear
-                int UE_id = find_nr_UE_id(ctxt_pP->module_id, ctxt_pP->rntiMaybeUEid);
+        if (!ue_context_p) {
+          LOG_E(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT " NR_RRCReestablishmentComplete without UE context, falt\n", PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
+          break;
+        }
 
-                if(UE_id == -1) {
-                  LOG_E(NR_RRC, PROTOCOL_RRC_CTXT_UE_FMT " NR_RRCConnectionReestablishmentComplete without UE_id(MAC) rnti %lx, fault\n", PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), ctxt_pP->rntiMaybeUEid);
-                  break;
-                }
+#if (0)
+        /* TODO : It may be needed if gNB goes into full stack working. */
+        // clear
+        int UE_id = find_nr_UE_id(ctxt_pP->module_id, ctxt_pP->rntiMaybeUEid);
 
-                RC.nrmac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 0;
+        if (UE_id == -1) {
+          LOG_E(NR_RRC, PROTOCOL_RRC_CTXT_UE_FMT " NR_RRCReestablishmentComplete without UE_id(MAC) rnti %lx, fault\n", PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), ctxt_pP->rntiMaybeUEid);
+          break;
+        }
+
+        RC.nrmac[ctxt_pP->module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 0;
 #endif
-                ue_context_p->ue_context.reestablishment_xid = -1;
 
-                if (ul_dcch_msg->message.choice.c1->choice.rrcReestablishmentComplete->criticalExtensions.present ==
-                    NR_RRCReestablishmentComplete__criticalExtensions_PR_rrcReestablishmentComplete) {
-                  rrc_gNB_process_RRCConnectionReestablishmentComplete(ctxt_pP, reestablish_rnti, ue_context_p,
-                      ul_dcch_msg->message.choice.c1->choice.rrcReestablishmentComplete->rrc_TransactionIdentifier);
+        if (ul_dcch_msg->message.choice.c1->choice.rrcReestablishmentComplete->criticalExtensions.present == NR_RRCReestablishmentComplete__criticalExtensions_PR_rrcReestablishmentComplete) {
+          rrc_gNB_process_RRCReestablishmentComplete(ctxt_pP, reestablish_rnti, ue_context_p, ul_dcch_msg->message.choice.c1->choice.rrcReestablishmentComplete->rrc_TransactionIdentifier);
 
-                }
+          gNB_MAC_INST *nrmac = RC.nrmac[ctxt_pP->module_id]; // WHAT A BEAUTIFULL RACE CONDITION !!!
+          mac_remove_nr_ue(nrmac, reestablish_rnti);
+        }
+
+        // ue_context_p->ue_context.ue_release_timer = 0;
+        ue_context_p->ue_context.ue_reestablishment_timer = 1;
+        // remove UE after 100 frames after NR_RRCReestablishmentRelease is triggered
+        ue_context_p->ue_context.ue_reestablishment_timer_thres = 1000;
+      } break;
 
-                //ue_context_p->ue_context.ue_release_timer = 0;
-                ue_context_p->ue_context.ue_reestablishment_timer = 1;
-                // remove UE after 100 frames after LTE_RRCConnectionReestablishmentRelease is triggered
-                ue_context_p->ue_context.ue_reestablishment_timer_thres = 1000;
-              }
-              break;
       default:
         break;
     }
@@ -3761,10 +3860,7 @@ void rrc_gNB_process_e1_bearer_context_setup_resp(e1ap_bearer_setup_resp_t *resp
     create_tunnel_resp.gnb_addr.length = sizeof(in_addr_t); // IPv4 byte length
   }
 
-  nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(&ctxt,
-                                               &create_tunnel_resp);
-
-  ue_context_p->ue_context.setup_pdu_sessions += resp->numPDUSessions;
+  nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(&ctxt, &create_tunnel_resp, 0);
 
   // TODO: SV: combine e1ap_bearer_setup_req_t and e1ap_bearer_setup_resp_t and minimize assignments
   prepare_and_send_ue_context_modification_f1(ue_context_p, resp);
@@ -4152,13 +4248,8 @@ rrc_gNB_generate_RRCRelease(
 )
 //-----------------------------------------------------------------------------
 {
-  uint8_t buffer[RRC_BUF_SIZE];
-  uint16_t size = 0;
-
-  memset(buffer, 0, sizeof(buffer));
-
-  size = do_NR_RRCRelease(buffer, sizeof(buffer),
-                          rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id));
+  uint8_t buffer[RRC_BUF_SIZE] = {0};
+  int size = do_NR_RRCRelease(buffer, RRC_BUF_SIZE, rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id));
   ue_context_pP->ue_context.ue_reestablishment_timer = 0;
   ue_context_pP->ue_context.ue_release_timer = 0;
   ue_context_pP->ue_context.ul_failure_timer = 0;
diff --git a/openair2/RRC/NR/rrc_gNB_GTPV1U.c b/openair2/RRC/NR/rrc_gNB_GTPV1U.c
index 3fef7bc0ef..d2831dcf5b 100644
--- a/openair2/RRC/NR/rrc_gNB_GTPV1U.c
+++ b/openair2/RRC/NR/rrc_gNB_GTPV1U.c
@@ -40,6 +40,7 @@
 //#endif
 
 # include "common/ran_context.h"
+#include "openair2/RRC/NR/rrc_gNB_GTPV1U.h"
 
 extern RAN_CONTEXT_t RC;
 
@@ -78,11 +79,8 @@ rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
   }
 }
 
-int
-nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
-  const protocol_ctxt_t *const ctxt_pP,
-  const gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_pP
-) {
+int nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(const protocol_ctxt_t *const ctxt_pP, const gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_pP, int offset)
+{
   int                            i;
   struct rrc_gNB_ue_context_s   *ue_context_p = NULL;
 
@@ -93,13 +91,14 @@ nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
     ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[ctxt_pP->module_id], ctxt_pP->rntiMaybeUEid);
 
     for (i = 0; i < create_tunnel_resp_pP->num_tunnels; i++) {
-      ue_context_p->ue_context.gnb_gtp_teid[i]  = create_tunnel_resp_pP->gnb_NGu_teid[i];
-      ue_context_p->ue_context.gnb_gtp_addrs[i] = create_tunnel_resp_pP->gnb_addr;
-      ue_context_p->ue_context.gnb_gtp_psi[i]   = create_tunnel_resp_pP->pdusession_id[i];
-      LOG_I(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP tunnel (%u, %u) bearer UE context index %u, id %u, gtp addr len %d \n",
+      ue_context_p->ue_context.gnb_gtp_teid[i + offset] = create_tunnel_resp_pP->gnb_NGu_teid[i];
+      ue_context_p->ue_context.gnb_gtp_addrs[i + offset] = create_tunnel_resp_pP->gnb_addr;
+      ue_context_p->ue_context.gnb_gtp_psi[i + offset] = create_tunnel_resp_pP->pdusession_id[i];
+      LOG_I(NR_RRC,
+            PROTOCOL_NR_RRC_CTXT_UE_FMT " nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP tunnel (%u, %u) bearer UE context index %u, id %u, gtp addr len %d \n",
             PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
             create_tunnel_resp_pP->gnb_NGu_teid[i],
-            ue_context_p->ue_context.gnb_gtp_teid[i],
+            ue_context_p->ue_context.gnb_gtp_teid[i + offset],
             i,
             create_tunnel_resp_pP->pdusession_id[i],
             create_tunnel_resp_pP->gnb_addr.length);
diff --git a/openair2/RRC/NR/rrc_gNB_GTPV1U.h b/openair2/RRC/NR/rrc_gNB_GTPV1U.h
index 03ef050bcf..d538127d76 100644
--- a/openair2/RRC/NR/rrc_gNB_GTPV1U.h
+++ b/openair2/RRC/NR/rrc_gNB_GTPV1U.h
@@ -38,10 +38,6 @@ rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
   uint8_t                         *inde_list
 );
 
-int
-nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
-  const protocol_ctxt_t *const ctxt_pP,
-  const gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_pP
-);
+int nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(const protocol_ctxt_t *const ctxt_pP, const gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_pP, int offset_in_rrc);
 
 #endif
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index 6f3ebcd06d..17749d4330 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -548,10 +548,8 @@ rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(
           return (0);
         }
 
-        nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
-          &ctxt,
-          &create_tunnel_resp);
-        ue_context_p->ue_context.setup_pdu_sessions +=  NGAP_INITIAL_CONTEXT_SETUP_REQ (msg_p).nb_of_pdusessions;
+        nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(&ctxt, &create_tunnel_resp, 0);
+        ue_context_p->ue_context.nb_of_pdusessions += NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nb_of_pdusessions;
         ue_context_p->ue_context.established_pdu_sessions_flag = 1;
       }
 
@@ -890,7 +888,7 @@ rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(
   msg_p = itti_alloc_new_message (TASK_RRC_GNB, 0, NGAP_PDUSESSION_SETUP_RESP);
   NGAP_PDUSESSION_SETUP_RESP(msg_p).gNB_ue_ngap_id = ue_context_pP->ue_context.gNB_ue_ngap_id;
 
-  for (pdusession = 0; pdusession < ue_context_pP->ue_context.setup_pdu_sessions; pdusession++) {
+  for (pdusession = 0; pdusession < ue_context_pP->ue_context.nb_of_pdusessions; pdusession++) {
     // if (xid == ue_context_pP->ue_context.pdusession[pdusession].xid) {
       if (ue_context_pP->ue_context.pduSession[pdusession].status == PDU_SESSION_STATUS_DONE) {
         pdusession_setup_t * tmp=&NGAP_PDUSESSION_SETUP_RESP(msg_p).pdusessions[pdu_sessions_done];
@@ -933,8 +931,11 @@ rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(
   }
 
   if ((pdu_sessions_done > 0) ) {
-    LOG_I(NR_RRC,"NGAP_PDUSESSION_SETUP_RESP: sending the message: nb_of_pdusessions %d, total pdu_sessions %d, index %d\n",
-          ue_context_pP->ue_context.nb_of_pdusessions, ue_context_pP->ue_context.setup_pdu_sessions, pdusession);
+    LOG_I(NR_RRC,
+          "NGAP_PDUSESSION_SETUP_RESP: sending the message: nb_of_pdusessions %d, total pdu_sessions %d, index %d\n",
+          ue_context_pP->ue_context.nb_of_pdusessions,
+          ue_context_pP->ue_context.nb_of_pdusessions,
+          pdusession);
     itti_send_msg_to_task (TASK_NGAP, ctxt_pP->instance, msg_p);
   }
 
@@ -978,8 +979,7 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
     itti_send_msg_to_task (TASK_NGAP, instance, msg_fail_p);
     return ;
   }
-  
-  ue_context_p->ue_context.nb_of_pdusessions = msg->nb_pdusessions_tosetup;
+
   ue_context_p->ue_context.gNB_ue_ngap_id    = msg->gNB_ue_ngap_id;
   ue_context_p->ue_context.amf_ue_ngap_id    = msg->amf_ue_ngap_id;
 
@@ -1000,11 +1000,16 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
   bearer_req.ueDlAggMaxBitRate = msg->ueAggMaxBitRateDownlink;
 
   bearer_req.numPDUSessions = msg->nb_pdusessions_tosetup;
+  int xid = rrc_gNB_get_next_transaction_identifier(ctxt.module_id);
 
   for (int i=0; i < bearer_req.numPDUSessions; i++) {
-    ue_context_p->ue_context.pduSession[i].param = msg->pdusession_setup_params[i];
-
+    int idx = ue_context_p->ue_context.nb_of_pdusessions++;
     pdu_session_to_setup_t *pdu = bearer_req.pduSession + i;
+    pdu->numDRB2Setup = 1; // One DRB per PDU Session. TODO: Remove hardcoding
+    ue_context_p->ue_context.pduSession[idx].param = msg->pdusession_setup_params[i];
+    ue_context_p->ue_context.pduSession[idx].xid = xid;
+    ue_context_p->ue_context.pduSession[idx].status = PDU_SESSION_STATUS_NEW;
+
     pdu->sessionId   = msg->pdusession_setup_params[i].pdusession_id;
     pdu->sessionType = msg->pdusession_setup_params[i].upf_addr.pdu_session_type;
     pdu->sst         = msg->allowed_nssai[i].sST;
@@ -1024,12 +1029,9 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
            msg->pdusession_setup_params[i].upf_addr.buffer,
            sizeof(uint8_t)*4);
 
-    ue_context_p->ue_context.pduSession[i].param = msg->pdusession_setup_params[i];
-    ue_context_p->ue_context.nb_of_pdusessions   = msg->nb_pdusessions_tosetup;
+    ue_context_p->ue_context.pduSession[idx].param = msg->pdusession_setup_params[i];
     ue_context_p->ue_context.gNB_ue_ngap_id      = msg->gNB_ue_ngap_id;
-    ue_context_p->ue_context.amf_ue_ngap_id      = msg->amf_ue_ngap_id;
-    pdu->numDRB2Setup = 1; // One DRB per PDU Session. TODO: Remove hardcoding
-    ue_context_p->ue_context.setup_pdu_sessions += pdu->numDRB2Setup;
+    ue_context_p->ue_context.amf_ue_ngap_id = msg->amf_ue_ngap_id;
     for (int j=0; j < pdu->numDRB2Setup; j++) {
       DRB_nGRAN_to_setup_t *drb = pdu->DRBnGRanList + j;
 
@@ -1059,9 +1061,9 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
       for (int k=0; k < drb->numQosFlow2Setup; k++) {
         qos_flow_to_setup_t *qos = drb->qosFlows + k;
 
-        qos->id          = msg->pdusession_setup_params[i].qos[k].qfi;
-        qos->fiveQI      = msg->pdusession_setup_params[i].qos[k].fiveQI;
-        qos->fiveQI_type = msg->pdusession_setup_params[i].qos[k].fiveQI_type;
+        qos->id = msg->pdusession_setup_params[j].qos[k].qfi;
+        qos->fiveQI = msg->pdusession_setup_params[j].qos[k].fiveQI;
+        qos->fiveQI_type = msg->pdusession_setup_params[j].qos[k].fiveQI_type;
 
         qos->qoSPriorityLevel = msg->pdusession_setup_params[i].qos[k].allocation_retention_priority.priority_level;
         qos->pre_emptionCapability = msg->pdusession_setup_params[i].qos[k].allocation_retention_priority.pre_emp_capability;
@@ -1263,7 +1265,7 @@ rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
   for (i = 0; i < ue_context_pP->ue_context.nb_of_modify_pdusessions; i++) {
     if (xid == ue_context_pP->ue_context.modify_pdusession[i].xid) {
       if (ue_context_pP->ue_context.modify_pdusession[i].status == PDU_SESSION_STATUS_DONE) {
-        for (j = 0; j < ue_context_pP->ue_context.setup_pdu_sessions; j++) {
+        for (j = 0; j < ue_context_pP->ue_context.nb_of_pdusessions; j++) {
           if (ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id == 
             ue_context_pP->ue_context.pduSession[j].param.pdusession_id) {
             LOG_I(NR_RRC, "update pdu session %d \n", ue_context_pP->ue_context.pduSession[j].param.pdusession_id);
@@ -1278,7 +1280,7 @@ rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
           }
         }
 
-        if (j < ue_context_pP->ue_context.setup_pdu_sessions) {
+        if (j < ue_context_pP->ue_context.nb_of_pdusessions) {
           NGAP_PDUSESSION_MODIFY_RESP(msg_p).pdusessions[pdu_sessions_done].pdusession_id = 
             ue_context_pP->ue_context.modify_pdusession[i].param.pdusession_id;
           for (qos_flow_index = 0; qos_flow_index < ue_context_pP->ue_context.modify_pdusession[i].param.nb_qos; qos_flow_index++) {
@@ -1321,8 +1323,11 @@ rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
   NGAP_PDUSESSION_MODIFY_RESP(msg_p).nb_of_pdusessions_failed = pdu_sessions_failed;
 
   if (pdu_sessions_done > 0 || pdu_sessions_failed > 0) {
-    LOG_D(NR_RRC,"NGAP_PDUSESSION_MODIFY_RESP: sending the message: nb_of_pdusessions %d, total pdu session %d, index %d\n",
-          ue_context_pP->ue_context.nb_of_modify_pdusessions, ue_context_pP->ue_context.setup_pdu_sessions, i);
+    LOG_D(NR_RRC,
+          "NGAP_PDUSESSION_MODIFY_RESP: sending the message: nb_of_pdusessions %d, total pdu session %d, index %d\n",
+          ue_context_pP->ue_context.nb_of_modify_pdusessions,
+          ue_context_pP->ue_context.nb_of_pdusessions,
+          i);
     itti_send_msg_to_task (TASK_NGAP, ctxt_pP->instance, msg_p);
   } else {
     itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
@@ -1348,8 +1353,8 @@ rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ(
     NGAP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).gNB_ue_ngap_id    = ue_context_pP->ue_context.gNB_ue_ngap_id;
     NGAP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).cause             = causeP;
     NGAP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).cause_value       = cause_valueP;
-    NGAP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).nb_of_pdusessions = ue_context_pP->ue_context.setup_pdu_sessions;
-    for (int pdusession = 0; pdusession < ue_context_pP->ue_context.setup_pdu_sessions; pdusession++) {
+    NGAP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).nb_of_pdusessions = ue_context_pP->ue_context.nb_of_pdusessions;
+    for (int pdusession = 0; pdusession < ue_context_pP->ue_context.nb_of_pdusessions; pdusession++) {
       NGAP_UE_CONTEXT_RELEASE_REQ(msg_context_release_req_p).pdusessions[pdusession].pdusession_id = ue_context_pP->ue_context.pduSession[pdusession].param.pdusession_id;
     }
     itti_send_msg_to_task(TASK_NGAP, GNB_MODULE_ID_TO_INSTANCE(gnb_mod_idP), msg_context_release_req_p);
@@ -1565,10 +1570,12 @@ rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE(
   NGAP_PDUSESSION_RELEASE_RESPONSE (msg_p).nb_of_pdusessions_failed = ue_context_pP->ue_context.nb_release_of_pdusessions;
   memcpy(&(NGAP_PDUSESSION_RELEASE_RESPONSE (msg_p).pdusessions_failed[0]), &ue_context_pP->ue_context.pdusessions_release_failed[0],
       sizeof(pdusession_failed_t)*ue_context_pP->ue_context.nb_release_of_pdusessions);
-  ue_context_pP->ue_context.setup_pdu_sessions -= pdu_sessions_released;
-  LOG_I(NR_RRC,"NGAP PDUSESSION RELEASE RESPONSE: GNB_UE_NGAP_ID %u release_pdu_sessions %d setup_pdu_sessions %d \n",
-        NGAP_PDUSESSION_RELEASE_RESPONSE (msg_p).gNB_ue_ngap_id,
-        pdu_sessions_released, ue_context_pP->ue_context.setup_pdu_sessions);
+  ue_context_pP->ue_context.nb_of_pdusessions -= pdu_sessions_released;
+  LOG_I(NR_RRC,
+        "NGAP PDUSESSION RELEASE RESPONSE: GNB_UE_NGAP_ID %u release_pdu_sessions %d setup_pdu_sessions %d \n",
+        NGAP_PDUSESSION_RELEASE_RESPONSE(msg_p).gNB_ue_ngap_id,
+        pdu_sessions_released,
+        ue_context_pP->ue_context.nb_of_pdusessions);
   itti_send_msg_to_task (TASK_NGAP, ctxt_pP->instance, msg_p);
 
   //clear xid
diff --git a/openair2/RRC/NR/rrc_gNB_UE_context.c b/openair2/RRC/NR/rrc_gNB_UE_context.c
index ec96a446c2..87b4de23b2 100644
--- a/openair2/RRC/NR/rrc_gNB_UE_context.c
+++ b/openair2/RRC/NR/rrc_gNB_UE_context.c
@@ -189,7 +189,7 @@ rrc_gNB_ue_context_5g_s_tmsi_exist(
 {
     struct rrc_gNB_ue_context_s        *ue_context_p = NULL;
     RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head) {
-        LOG_I(NR_RRC,"checking for UE 5G S-TMSI %ld: rnti %d \n",
+        LOG_I(NR_RRC,"Checking for UE 5G S-TMSI %ld: RNTI %04x\n",
               s_TMSI, ue_context_p->ue_context.rnti);
 
         if (ue_context_p->ue_context.ng_5G_S_TMSI_Part1 == s_TMSI) {
diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c
index 379e4d8bdc..df30753595 100644
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
@@ -386,6 +386,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
 
   nr_pdcp_add_drbs(ctxt.enb_flag,
                    ctxt.rntiMaybeUEid,
+                   0,
                    ue_context_p->ue_context.rb_config->drb_ToAddModList,
                    (ue_context_p->ue_context.integrity_algorithm << 4) | ue_context_p->ue_context.ciphering_algorithm,
                    kUPenc,
diff --git a/openair2/RRC/NR/rrc_gNB_radio_bearers.c b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
index ff8149b83f..13a24cbea7 100644
--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.c
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
@@ -22,12 +22,8 @@
 #include "rrc_gNB_radio_bearers.h"
 #include "oai_asn1.h"
 
-NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
-                               uint8_t drb_id,
-                               const pdu_session_param_t *pduSession,
-                               bool enable_sdap,
-                               int do_drb_integrity,
-                               int do_drb_ciphering) {
+NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering)
+{
   NR_DRB_ToAddMod_t *DRB_config  = NULL;
   NR_SDAP_Config_t  *SDAP_config = NULL;
 
@@ -38,10 +34,8 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
   
   /* SDAP Configuration */
   SDAP_config = CALLOC(1, sizeof(NR_SDAP_Config_t));
-  memset(SDAP_config, 0, sizeof(NR_SDAP_Config_t));
   SDAP_config->mappedQoS_FlowsToAdd = calloc(1, sizeof(struct NR_SDAP_Config__mappedQoS_FlowsToAdd));
-  memset(SDAP_config->mappedQoS_FlowsToAdd, 0, sizeof(struct NR_SDAP_Config__mappedQoS_FlowsToAdd));
-  
+
   SDAP_config->pdu_Session = pduSession->param.pdusession_id;
   
   if (enable_sdap) {
@@ -61,9 +55,9 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
     asn1cSeqAdd(&SDAP_config->mappedQoS_FlowsToAdd->list, qfi);
 
     if(pduSession->param.qos[qos_flow_index].fiveQI > 5)
-      ue->pduSession[pduSession->param.pdusession_id].param.used_drbs[drb_id-1] = DRB_ACTIVE_NONGBR;
+      pduSession->param.used_drbs[drb_id - 1] = DRB_ACTIVE_NONGBR;
     else
-      ue->pduSession[pduSession->param.pdusession_id].param.used_drbs[drb_id-1] = DRB_ACTIVE;
+      pduSession->param.used_drbs[drb_id - 1] = DRB_ACTIVE;
   }
   
   SDAP_config->mappedQoS_FlowsToRelease = NULL;
@@ -110,12 +104,13 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
   return DRB_config;
 }
 
-uint8_t next_available_drb(gNB_RRC_UE_t *ue, uint8_t pdusession_id, bool is_gbr) {
+uint8_t next_available_drb(gNB_RRC_UE_t *ue, pdu_session_param_t *pdusession, bool is_gbr)
+{
   uint8_t drb_id;
 
   if(!is_gbr) { /* Find if Non-GBR DRB exists in the same PDU Session */
     for (drb_id = 0; drb_id < NGAP_MAX_DRBS_PER_UE; drb_id++)
-      if(ue->pduSession[pdusession_id].param.used_drbs[drb_id] == DRB_ACTIVE_NONGBR)
+      if (pdusession->param.used_drbs[drb_id] == DRB_ACTIVE_NONGBR)
         return drb_id+1;
   }
   /* GBR Flow  or a Non-GBR DRB does not exist in the same PDU Session, find an available DRB */
@@ -128,6 +123,7 @@ uint8_t next_available_drb(gNB_RRC_UE_t *ue, uint8_t pdusession_id, bool is_gbr)
 }
 
 bool drb_is_active(gNB_RRC_UE_t *ue, uint8_t drb_id) {
+  DevAssert(drb_id > 0);
   if(ue->DRB_active[drb_id-1] == DRB_ACTIVE)
     return true;
   return false;
diff --git a/openair2/RRC/NR/rrc_gNB_radio_bearers.h b/openair2/RRC/NR/rrc_gNB_radio_bearers.h
index 86ab093ced..6cd6443d4f 100644
--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.h
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.h
@@ -35,14 +35,10 @@
 #define GBR_FLOW                (1)
 #define NONGBR_FLOW             (0)
 
-NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue,
-                               uint8_t drb_id,
-                               const pdu_session_param_t *pduSession,
-                               bool enable_sdap,
-                               int do_drb_integrity,
-                               int do_drb_ciphering);
+NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, uint8_t drb_id, pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering);
+
+uint8_t next_available_drb(gNB_RRC_UE_t *ue, pdu_session_param_t *pdusession, bool is_gbr);
 
-uint8_t next_available_drb(gNB_RRC_UE_t *ue, uint8_t pdusession_id, bool is_gbr);
 bool drb_is_active(gNB_RRC_UE_t *ue, uint8_t drb_id);
 
 #endif
diff --git a/openair2/RRC/NR_UE/rrc_UE.c b/openair2/RRC/NR_UE/rrc_UE.c
index 7f2fa14dd6..fe50cb4177 100644
--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
@@ -2062,6 +2062,7 @@ nr_rrc_ue_establish_srb2(
        // Refresh DRBs
      nr_pdcp_add_drbs(ctxt_pP->enb_flag,
                       ctxt_pP->rntiMaybeUEid,
+                      0,
                       radioBearerConfig->drb_ToAddModList,
                       NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm | (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
                       kUPenc,
@@ -2596,12 +2597,11 @@ nr_rrc_ue_generate_rrcReestablishmentComplete(
 )
 //-----------------------------------------------------------------------------
 {
-    uint32_t length;
-    uint8_t buffer[100];
-    length = do_RRCReestablishmentComplete(buffer, sizeof(buffer),
+    uint8_t buffer[RRC_BUFFER_SIZE] = {0};
+    int size = do_RRCReestablishmentComplete(buffer, RRC_BUFFER_SIZE,
                                            rrcReestablishment->rrc_TransactionIdentifier);
     LOG_I(NR_RRC,"[UE %d][RAPROC] Frame %d : Logical Channel UL-DCCH (SRB1), Generating RRCReestablishmentComplete (bytes%d, gNB %d)\n",
-          ctxt_pP->module_id,ctxt_pP->frame, length, gNB_index);
+          ctxt_pP->module_id,ctxt_pP->frame, size, gNB_index);
 }
 
 void *recv_msgs_from_lte_ue(void *args_p)
diff --git a/openair3/SECU/sha_256_hmac.c b/openair3/SECU/sha_256_hmac.c
index ae49b1d1a2..528b2821a1 100644
--- a/openair3/SECU/sha_256_hmac.c
+++ b/openair3/SECU/sha_256_hmac.c
@@ -24,8 +24,9 @@
 
 #include <openssl/hmac.h>
 
-#if OPENSSL_VERSION_MAJOR >= 3
-// code for version 3.0 or greater
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+
+/* code for version 3.0 or greater */
 
 #include <openssl/core_names.h>
 
@@ -72,8 +73,11 @@ void sha_256_hmac(const uint8_t key[32], byte_array_t data, size_t len, uint8_t
   EVP_MAC_free(mac);
   OSSL_LIB_CTX_free(library_context);
 }
-#else
-// code for 1.1.x or lower
+
+#elif OPENSSL_VERSION_NUMBER >= 0x10100000L
+
+/* code for version >= 1.1.0 and < 3.0.0 */
+
 void sha_256_hmac(const uint8_t key[32], byte_array_t data, size_t len, uint8_t out[len])
 {
   DevAssert(key != NULL);
@@ -92,4 +96,27 @@ void sha_256_hmac(const uint8_t key[32], byte_array_t data, size_t len, uint8_t
   HMAC_CTX_free(ctx);
 }
 
+#else
+
+/* code for version lower than 1.1.0 */
+
+void sha_256_hmac(const uint8_t key[32], byte_array_t data, size_t len, uint8_t out[len])
+{
+  DevAssert(key != NULL);
+  DevAssert(data.buf != NULL);
+  DevAssert(data.len != 0);
+  DevAssert(len != 0);
+
+  HMAC_CTX ctx;
+  HMAC_CTX_init(&ctx);
+
+  HMAC_Init_ex(&ctx, key, 32, EVP_sha256(), NULL);
+
+  HMAC_Update(&ctx, data.buf, data.len);
+
+  HMAC_Final(&ctx, out, (uint32_t*)&len);
+
+  HMAC_CTX_cleanup(&ctx);
+}
+
 #endif
diff --git a/openair3/ocp-gtpu/gtp_itf.cpp b/openair3/ocp-gtpu/gtp_itf.cpp
index b598a29c16..284b5cda35 100644
--- a/openair3/ocp-gtpu/gtp_itf.cpp
+++ b/openair3/ocp-gtpu/gtp_itf.cpp
@@ -761,13 +761,32 @@ int gtpv1u_create_ngu_tunnel(  const instance_t instance,
   return !GTPNOK;
 }
 
-int gtpv1u_update_ngu_tunnel(
-  const instance_t instanceP,
-  const gtpv1u_gnb_create_tunnel_req_t *const  create_tunnel_req_pP,
-  const ue_id_t prior_ueid
-) {
-  AssertFatal( false, "to be developped\n");
-  return GTPNOK;
+int gtpv1u_update_ngu_tunnel(const instance_t instanceP, const gtpv1u_gnb_create_tunnel_req_t *const create_tunnel_req_pP, const ue_id_t prior_ue_id)
+{
+  LOG_D(GTPU, "[%ld] Update tunnels from UEid %lx to UEid %lx\n", instanceP, prior_ue_id, create_tunnel_req_pP->ue_id);
+
+  pthread_mutex_lock(&globGtp.gtp_lock);
+
+  auto inst = &globGtp.instances[compatInst(instanceP)];
+  auto it = inst->ue2te_mapping.find(prior_ue_id);
+  if (it == inst->ue2te_mapping.end()) {
+    LOG_W(GTPU, "[%ld] Delete GTP tunnels for UEid: %lx, but no tunnel exits\n", instanceP, prior_ue_id);
+    pthread_mutex_unlock(&globGtp.gtp_lock);
+    return GTPNOK;
+  }
+
+  for (int i = 0; i < create_tunnel_req_pP->num_tunnels; i++) {
+    teid_t incoming_teid = inst->ue2te_mapping[prior_ue_id].bearers[create_tunnel_req_pP->pdusession_id[i]].teid_incoming;
+    if (globGtp.te2ue_mapping[incoming_teid].ue_id == prior_ue_id) {
+      globGtp.te2ue_mapping[incoming_teid].ue_id = create_tunnel_req_pP->ue_id;
+    }
+  }
+
+  inst->ue2te_mapping[create_tunnel_req_pP->ue_id] = it->second;
+  inst->ue2te_mapping.erase(it);
+
+  pthread_mutex_unlock(&globGtp.gtp_lock);
+  return !GTPNOK;
 }
 
 int gtpv1u_create_x2u_tunnel(
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
index ceb312e9c2..36614b0e9c 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -11,7 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }) });
+    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
 
     nr_cellid = 12345678L;