fix nullPointerRedundantCheck warnings found by cppcheck

2026-07-15 21:50:27 +00:00 · 2023-07-18 20:45:43 +05:30
273 changed files with 5244 additions and 23225 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,8 +163,8 @@ set(CMAKE_CXX_FLAGS

 add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)" ON)
 if (SANITIZE_ADDRESS)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fstack-check -fno-omit-frame-pointer -fno-common")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fstack-check -fno-omit-frame-pointer -fno-common")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
  # There seems to be some incompatibility with pthread_create and the RT scheduler, which
  # results in pthread_create hanging.
  #
@@ -268,7 +268,7 @@ add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
 target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 # asn1c skeletons have hardcoded this flag to make customized debug logs
-# OAI uses this feature to re-use OAI LOG_I(ASN1, ...)
+# OAI uses this feature to re-use OAI LOG_I(ASN, ...)
 if (DEBUG_ASN1C)
  add_definitions(-DHAVE_CONFIG_H)
 endif()
@@ -300,6 +300,10 @@ target_link_libraries(lte_rrc PRIVATE nr_rrc)
 add_library(nr_rrc ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c)
 target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc)

+
+# S1AP and NGAP need crypt library
+pkg_check_modules(libcrypt REQUIRED libcrypt)
+
 # S1AP
 ##############
 set(S1AP_DIR ${OPENAIR3_DIR}/S1AP)
@@ -321,6 +325,8 @@ add_library(s1ap
  )
 target_link_libraries(s1ap PUBLIC asn1_s1ap)
 target_link_libraries(s1ap PRIVATE nr_rrc asn1_nr_rrc_hdrs lte_rrc)
+target_include_directories(s1ap PRIVATE ${libcrypt_INCLUDE_DIRS})
+target_link_libraries(s1ap PUBLIC ${libcrypt_LIBRARIES})

 # NGAP
 ##############
@@ -342,6 +348,8 @@ add_library(ngap
  )
 target_link_libraries(ngap PUBLIC asn1_ngap)
 target_link_libraries(ngap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+target_include_directories(ngap PRIVATE ${libcrypt_INCLUDE_DIRS})
+target_link_libraries(ngap PRIVATE ${libcrypt_LIBRARIES})

 #M2AP
 ##############
@@ -689,7 +697,6 @@ target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
-  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue_sl.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_frame_config_nr_ue.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/harq_nr.c
@@ -1061,20 +1068,8 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/sss_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/cic_filter_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync_sl.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_rx.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_tx.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psfch_tx.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pscch_tx.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_pucch_rx.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci_tools.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -1094,14 +1089,11 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c
-  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c
-  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
  ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
 # ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
@@ -1136,8 +1128,8 @@ target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)
 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

-#pkg_check_modules(blas REQUIRED blas)
-#pkg_check_modules(lapacke REQUIRED lapacke)
+pkg_check_modules(blas REQUIRED blas)
+pkg_check_modules(lapacke REQUIRED lapacke)

 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1319,7 +1311,6 @@ set(NR_L2_SRC_UE
  ${NR_UE_RRC_DIR}/rrc_UE.c
  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
-  ${NR_UE_RRC_DIR}/rrc_sl_preconfig.c
  )

 set (MAC_SRC
@@ -1368,7 +1359,7 @@ set (MAC_NR_SRC


 set (MAC_SRC_UE
-	#  ${PHY_INTERFACE_DIR}/phy_stub_UE.c
+  ${PHY_INTERFACE_DIR}/phy_stub_UE.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${MAC_DIR}/main_ue.c
  ${MAC_DIR}/ue_procedures.c
@@ -1382,17 +1373,13 @@ set (MAC_NR_SRC_UE
  ${NR_UE_PHY_INTERFACE_DIR}/NR_IF_Module.c
  ${NR_UE_PHY_INTERFACE_DIR}/NR_Packet_Drop.c
  ${NR_UE_MAC_DIR}/config_ue.c
-  ${NR_UE_MAC_DIR}/config_ue_sl.c
  ${NR_UE_MAC_DIR}/mac_vars.c
  ${NR_UE_MAC_DIR}/main_ue_nr.c
  ${NR_UE_MAC_DIR}/nr_ue_procedures.c
-  ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
  ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
  ${NR_UE_MAC_DIR}/nr_ue_power_procedures.c
-  ${NR_UE_MAC_DIR}/nr_ue_sci_slsch.c
-  ${NR_UE_MAC_DIR}/nr_slsch_scheduler.c
 )

 set (ENB_APP_SRC
@@ -1459,7 +1446,7 @@ add_library(e1_if
  ${NR_RRC_DIR}/cucp_cuup_e1ap.c
  )

-target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} e1ap GTPV1U)
+target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} crypt e1ap GTPV1U)

 add_library(e1_pdcp_if
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
@@ -1896,6 +1883,8 @@ set (SIMUSRC
 )
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
+target_link_libraries(SIMU PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
+target_include_directories(SIMU PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})

 # Qt-based scope
 add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
@@ -2243,24 +2232,6 @@ target_link_libraries(nr_pbchsim PRIVATE
 )
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

-add_executable(nr_psbchsim
-  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
-  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
-  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
-  ${NR_UE_RRC_DIR}/rrc_nsa.c
-  ${NFAPI_USER_DIR}/nfapi.c
-  ${NFAPI_USER_DIR}/gnb_ind_vars.c
-  ${PHY_INTERFACE_DIR}/queue_t.c
-  ${T_SOURCE}
-  ${SHLIB_LOADER_SOURCES}
-  )
-target_link_libraries(nr_psbchsim PRIVATE
-  -Wl,--start-group UTIL SIMU SIMU_ETH 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 nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl shlib_loader
-  )
-target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 #PUCCH ---> Prashanth
 add_executable(nr_pucchsim
--- a/README.md
+++ b/README.md
@@ -1,330 +1,74 @@
-# OAI-SL-MultiUE-Broker
+<h1 align="center">
+    <a href="https://openairinterface.org/"><img src="https://openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png" alt="OAI" width="550"></a>
+</h1>

+<p align="center">
+    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS Ubuntu 18"></a>
+    <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
+    <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
+    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
+    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
+</p>

+<p align="center">
+    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Container-Parent/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Container-Parent%2F&label=build%20Images"></a>
+</p>

-## RFSim Broker based Multiple UEs Test 
+<p align="center">
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-gnb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-gnb?label=gNB%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-enb?label=eNB%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
+</p>

-This part test is based on ‘sl-eurecom4’ branch on openairinterface5g.
-(https://gitlab.eurecom.fr/oai/openairinterface5g.git)
+# OpenAirInterface License #

+ *  [OAI License Model](http://www.openairinterface.org/?page_id=101)
+ *  [OAI License v1.1 on our website](http://www.openairinterface.org/?page_id=698)

-## To start
+It is distributed under **OAI Public License V1.1**.

-First go to the correct repository :
-```
-cd openairinterface5g/cmake_targets
-```
-To install zeroMQ : 
-```
-apt-get install libzmq3-dev
-```
-Then start compilation : 
-```
-sudo ./build_oai --nrUE -w SIMU --cmake-opt -DENABLE_T_TRACER=OFF
-```
-Or, to start a clean start compilation, do the clean up first then compile : 
-```
-sudo ./build_oai -c -C  
+The license information is distributed under [LICENSE](LICENSE) file in the same directory.

-sudo ./build_oai -I --cmake-opt -DENABLE_T_TRACER=OFF
-```
- Now we need to create three UEs through namespaces: 
-```
-cd openairinterface5g/cmake_targets
-sudo ./multi-ue.sh -c1 -c2 -c3
-```
-* It is likely the new system would face the ASN.1 error, which is due to the wrong version of ASN.1. To fix it, please do the following: 
+Please see [NOTICE](NOTICE.md) file for third party software that is included in the sources.

-* Remove the current wrong version :
-```
-sudo rm -rf /opt/asn1c 
-sudo rm -rf /tmp/asn1c
-```
-* Clone and checkout the exact same commit:
-```
-cd /tmp 
-git clone https://github.com/mouse07410/asn1c.git 
-cd asn1c 
-git checkout 657f5790
-```
-* Build and install the correct version : 
-```
-git submodule update --init --recursive 
-autoreconf -iv 
-./configure --prefix=/opt/asn1c 
-make -j$(nproc) 
-sudo make install
-```
-* Then recompile. Do remember to delete the wrong /ran_build files : 
-```
-cd ~/OAI-SL-Broker/openairinterface5g/cmake_targets 
-rm -rf ran_build 
-sudo ./build_oai --nrUE -w SIMU --cmake-opt -DENABLE_T_TRACER=OFF
-```
- 
+# Where to Start #

+ *  [General overview of documentation](./doc/README.md)
+ *  [The implemented features](./doc/FEATURE_SET.md)
+ *  [How to build](./doc/BUILD.md)
+ *  [How to run the modems](./doc/RUNMODEM.md)

- 
-## Start RFSim for Multiple UEs through Broker
-
-
-### Launch Broker (outside namespace):
-```
-cd ran_build/build/
-./broker
-```
-
-### Launch SYNC-REF (namespace 1):
-```
-sudo ./multi-ue.sh -o1
-cd ran_build/build/
-sudo RFSIMULATOR=server ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/sl_sync_ref.conf --sl-mode 2 --sa --sync-ref --brokerip 10.201.1.100
-```
-
-### Launch UE2 (namespace 2):
-```
-sudo ./multi-ue.sh -o2
-cd ran_build/build/
-sudo ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue1.conf --sl-mode 2 --sa --brokerip 10.202.1.100 --device_id 1 | sudo tee $HOME/sl-oai-release4/rat-selection/logs/sl.log 
-```
-
-### Launch UE3 (namespace 3):
-```
-sudo ./multi-ue.sh -o3
-cd ran_build/build/
- sudo ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue2.conf --sl-mode 2 --sa --brokerip 10.203.1.100 --device_id 2 | sudo tee $HOME/sl-oai-release4/rat-selection/logs/sl.log
-```
-
-Optional : You can now quickly check the connection to sync-ref from two UEs : 
-```
-ping -I oaitun_ue2 10.0.0.1
-ping -I oaitun_ue3 10.0.0.1
-```
-
-Note: when restart the simulation, you might need to kill everything first by the following command : 
-``` 
-sudo pkill -f nr-uesoftmodem 
-sudo pkill -f broker
-sudo pkill -f rfsimulator
-```
-
-##  Monitor route with Babel and Wireshark
-You might need to first install Babel onto the local machine
+Not all information is available in a central place, and information for
+specific sub-systems might be available in the corresponding sub-directories.
+To find all READMEs, this command might be handy:

 ```
-sudo apt update
-sudo apt install babeld
+find . -iname "readme*"
 ```

-### Launch SYNC-REF (namespace 1):
-First go into the correct namespace : 
-```
-sudo ./multi-ue.sh -o1
-```
+# RAN repository structure #

-In order to have a readable address at the logside, we'll hardcode the IP address through following command, so sync-ref will be translate as 'fe80::1/64'
-```
-sudo ip netns exec ue1 ip -6 addr add fe80::1/64 dev oaitun_ue1 nodad  
-```
-Then launch Babel on sync-ref : 
-```
-ip netns exec ue1 bash -lc '
-set -e
-cat > /tmp/babeld-ue1.conf <<EOF
-interface oaitun_ue1
-redistribute local deny
-pid-file /tmp/babeld-ue1.pid
-EOF
-babeld -d 1 -c /tmp/babeld-ue1.conf
-'
-```
-For now, as no other UE is connected, sync-ref will simply print its local id.
-
-### Launch UE2 (namespace 2):
-First go into the correct namespace : 
-```
-sudo ./multi-ue.sh -o2
-```
-
-To make it easier to observe, UE2 will be allocated address as 'fe80::2/64' by following command : 
-```
-sudo ip netns exec ue2 ip -6 addr add fe80::2/64 dev oaitun_ue2 nodad
-```
-Then launch Babel on UE2 : 
-```
-ip netns exec ue2 bash -lc '
-set -e
-cat > /tmp/babeld-ue2.conf <<EOF
-interface oaitun_ue2
-redistribute local deny
-pid-file /tmp/babeld-ue2.pid
-EOF
-babeld -d 1 -c /tmp/babeld-ue2.conf
-'
-```
-
-### Launch UE3 (namespace 3):
-First go into the correct namespace : 
-```
-sudo ./multi-ue.sh -o3
-```
-
-UE3 will be allocated address as 'fe80::3/64'
-```
-sudo ip netns exec ue3 ip -6 addr add fe80::3/64 dev oaitun_ue3 nodad
+The OpenAirInterface (OAI) software is composed of the following parts: 

 ```
-Then launch Babel on UE3 : 
-```
-ip netns exec ue3 bash -lc '
-set -e
-cat > /tmp/babeld-ue3.conf <<EOF
-interface oaitun_ue3
-redistribute local deny
-pid-file /tmp/babeld-ue3.pid
-EOF
-babeld -d 1 -c /tmp/babeld-ue3.conf
-'
-
-```
-
-Note : On babel, it will show neighbour connection with 'Neighbour ... rxcost 96 txcost 65535...', when it's 96, it means perfect connection, 65535 means a bad connection, if the connection is bad when generating the UE3, try to kill and restart again.
-
-### Wireshark monitor
-Within the each namespace, you can start wireshark with filter on each node to check the Babel messages (example as for sync-ref, please update the oaitun_ueX name for each UE): 
-```
-sudo wireshark -i oaitun_ue1 -k &
-```
-You should be able to see 'Babel Hello' message, and 'Babel Hello ihu'. ihu representing 'I hear you'.
-When there are two UEs connecting to sync-ref at the same time, you should be able to see 'Babel Hello ihu ihu'
-
-
-## Enable TAP in RFSim for Multiple UEs
-This part is to switch from default TUN to TAP. 
-The baseline is, by default, system is running through TUN. In order to enable TAP, when you run each node simply add a flag at the begining: " OAI_TUNTAP_MODE=tap".
-
-Optional : To disable the TAP (in case of an uncleaned restart...), do the following : 
-```
-unset OAI_TUNTAP_MODE
-```
-### Launch Broker (outside namespace):
-```
-cd ran_build/build/
-./broker
-```
-### Launch SYNC-REF (namespace 1):
-```
-sudo ./multi-ue.sh -o1
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap RFSIMULATOR=server ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/sl_sync_ref.conf --sl-mode 2 --sa --sync-ref --brokerip 10.201.1.100
-```
-
-### Launch UE2 (namespace 2):
-```
-sudo ./multi-ue.sh -o2
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue1.conf --sl-mode 2 --sa --brokerip 10.202.1.100 --device_id 1 | sudo tee $HOME/sl-oai-release4/rat-selection/logs/sl.log
-```
-
-### Launch UE3 (namespace 3):
-```
-sudo ./multi-ue.sh -o3
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue2.conf --sl-mode 2 --sa --brokerip 10.203.1.100 --device_id 2 | sudo tee $HOME/sl-oai-release4/rat-selection/logs/sl.log
-```
-
-## Check connection with Batman
-
-### Start Batman on sync-ref (namespace 1):
-```
-sudo ./multi-ue.sh -o1
-ip link set oaitun_ue1 address 02:00:00:00:00:01
-sudo batctl if add oaitun_ue1
-```
-
-### Start Batman on UE2 (namespace 2):
-```
-sudo ./multi-ue.sh -o2
-ip link set oaitun_ue2 address 02:00:00:00:00:02
-sudo batctl if add oaitun_ue2
-```
-
-
-### Start Batman on UE3 (namespace 3):
-```
-sudo ./multi-ue.sh -o3
-ip link set oaitun_ue3 address 02:00:00:00:00:03
-sudo batctl if add oaitun_ue3
-```
-### Batman command
-To check the neighbour : 
-```
-batctl n
-```
-To check the routing table : 
-```
-batctl o
-```
-
-### Start wireshark with filter
-You can check the current packets exchange with wireshark, please update the name 'oaitun_ueX' accordingly. 
-```
-wireshark -k -i oaitun_ueX -Y "eth.type == 0x4305"
-```
-
-## HW with TAP 
-Similarly, we can start the HW with TAP with the following command 
- 
-### Launch SYNC-REF (machine 1):
-```
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap ./nr-uesoftmodem -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/sl_sync_ref.conf --sa -E --sl-mode 2 --sync-ref  --usrp-args "type=b200,master_clock_rate=46.08e6,enable_gps=true" --ue-txgain 10 --ue-rxgain 100 --thread-pool -1,-1,-1,-1 --clock-source 2 --time-source 2
-```
-
-### Launch UE2 (machine 2):
-```
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap ./nr-uesoftmodem -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue1.conf --sa -E --sl-mode 2 --usrp-args "type=b200,master_clock_rate=46.08e6,enable_gps=true" --ue-txgain 10 --ue-rxgain 100 --thread-pool -1,-1,-1,-1 --clock-source 2 --time-source 2
-```
-
-### Launch UE3 (machine 3):
-```
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap ./nr-uesoftmodem -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue2.conf --sa -E --sl-mode 2 --usrp-args "type=b200,master_clock_rate=46.08e6,enable_gps=true" --ue-txgain 10 --ue-rxgain 100 --thread-pool -1,-1,-1,-1 --clock-source 2 --time-source 2
-```
-
-## More UEs generated with TAP 
-The newest update enables to generate more than 2 UEs along with one sync-ref. The following is an example of 3 UEs.
-One would, first, need to create a new .conf file in openairinterface5g/targets/PROJECTS/NR-SIDELINK/, second, in file /openairinterface5g/openair2/LAYER2/NR_MAC_UE/mac_defs.h, the parameter of "#define CUR_SL_UE_CONNECTIONS" need to be updated to match the max number of UEs(Exclusive of sync-ref, this value is limited to 6 though)
-### Launch Broker (outside namespace):
-```
-cd ran_build/build/
-./broker
-```
-### Launch SYNC-REF (namespace 1):
-```
-sudo ./multi-ue.sh -o1
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap RFSIMULATOR=server ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/sl_sync_ref.conf --sl-mode 2 --sa --sync-ref --brokerip 10.201.1.100  --thread-pool -1,-1
-```
-
-### Launch UE2 (namespace 2):
-```
-sudo ./multi-ue.sh -o2
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue1.conf --sl-mode 2 --sa --brokerip 10.202.1.100 --device_id 1  --thread-pool -1,-1 | sudo tee $HOME/sl-oai-release4/rat-selection/logs/sl.log 
-```
-
-### Launch UE3 (namespace 3):
-```
-sudo ./multi-ue.sh -o3
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue2.conf --sl-mode 2 --sa --brokerip 10.203.1.100 --device_id 2  --thread-pool -1,-1 | sudo tee $HOME/sl-oai-release4/rat-selection/logs/sl.log
-```
-
-### Launch UE4 (namespace 4):
-```
-sudo ./multi-ue.sh -o4
-cd ran_build/build/
-sudo OAI_TUNTAP_MODE=tap ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/ue3.conf --sl-mode 2 --sa --brokerip 10.204.1.100 --device_id 3  --thread-pool -1,-1 | sudo tee $HOME/sl-oai-release4/rat-selection/logs/sl.log
+openairinterface5g
+├── charts
+├── ci-scripts        : Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
+├── CMakeLists.txt    : Top-level CMakeLists.txt for building
+├── cmake_targets     : Build utilities to compile (simulation, emulation and real-time platforms), and generated build files.
+├── common            : Some common OAI utilities, some other tools can be found at openair2/UTILS.
+├── doc               : Documentation
+├── docker            : Dockerfiles to build for Ubuntu and RHEL
+├── executables       : Top-level executable source files (gNB, eNB, ...)
+├── maketags          : Script to generate emacs tags.
+├── nfapi             : (n)FAPI code for MAC-PHY interface
+├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
+├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
+├── openshift         : OpenShift helm charts for some deployment options of OAI
+├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
+└── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```
--- a/ci-scripts/Jenkinsfile-cluster
+++ b/ci-scripts/Jenkinsfile-cluster
@@ -204,9 +204,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    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
--- a/ci-scripts/Jenkinsfile-nrue
+++ b/ci-scripts/Jenkinsfile-nrue
@@ -200,9 +200,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    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} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath}"
-                   }
                  } catch (Exception e) {
                    currentBuild.result = 'FAILURE'
                    buildStageStatus = false
--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -192,9 +192,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    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
--- a/ci-scripts/Jenkinsfile-tmp-full-ran
+++ b/ci-scripts/Jenkinsfile-tmp-full-ran
@@ -200,9 +200,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                    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
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb
@@ -196,9 +196,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                                if (fileExists(xmlFile)) {
                                    try {
-                                      timeout (time: 60, unit: 'MINUTES') {
                                        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
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -215,9 +215,7 @@ pipeline {
              for (xmlFile in myXmlTestSuite) {
                if (fileExists(xmlFile)) {
                  try {
-                   timeout (time: 60, unit: 'MINUTES') {
                    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
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -211,9 +211,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                    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
--- a/ci-scripts/Jenkinsfile-tmp-ue
+++ b/ci-scripts/Jenkinsfile-tmp-ue
@@ -185,9 +185,7 @@ pipeline {
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                    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
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -141,18 +141,6 @@ rfsim5g_ue:
  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1
  CmdPrefix: docker exec rfsim5g-oai-nr-ue
  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue
-  DetachScript: docker stop rfsim5g-oai-nr-ue
-  MTU: 1500
-
-rfsim5g_ue2:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue2 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue2
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue2
-  DetachScript: docker stop rfsim5g-oai-nr-ue2
-  MTU: 1500

 rfsim5g_ext_dn:
  Host: localhost
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -53,13 +53,10 @@ import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
-
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue']
-
 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
 		logging.error('need ranCommitID in CreateWorkspace()')
@@ -803,7 +800,8 @@ class Containerize():
 			logging.debug('Removing test images locally')
 			myCmd = cls_cmd.LocalCmd()

-		for image in IMAGES:
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup', 'oai-gnb-aw2s']
+		for image in imageNames:
 			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			cmd = f'docker rmi oai-ci/{imageTag}'
 			myCmd.run(cmd, reportNonZero=False)
@@ -840,9 +838,12 @@ class Containerize():

 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
 		mySSH.command('cp docker-compose.y*ml ci-docker-compose.yml', '\$', 5)
-		for image in IMAGES:
+		imagesList = ['oai-enb', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue']
+		for image in imagesList:
 			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			mySSH.command(f'sed -i -e "s#image: {image}:latest#image: oai-ci/{imageTag}#" ci-docker-compose.yml', '\$', 2)
+		localMmeIpAddr = EPC.MmeIPAddress
+		mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2)

 		# Currently support only one
 		svcName = self.services[self.eNB_instance]
@@ -903,7 +904,7 @@ class Containerize():
 			cnt = 0
 			while (cnt < 20):
 				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30)
-				result = re.search('got sync|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
+				result = re.search('got sync|Starting F1AP at CU|Got sync', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -1004,7 +1005,7 @@ class Containerize():
 			HTML.htmleNBFailureMsg='Could not copy logfile to analyze it!'
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
-		# use function for UE log analysis, when oai-nr-ue container is used
+                # use function for UE log analysis, when oai-nr-ue container is used
 		elif 'oai-nr-ue' in services:
 			self.exitStatus == 0
 			logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
@@ -1197,7 +1198,8 @@ class Containerize():
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
 		myCmd.run(cmd, silent=self.displayedNewTags)
-		for image in IMAGES:
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
+		for image in imageNames:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -134,9 +134,9 @@ class OaiCiTest():
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
-		SSH.command(f'mkdir -p {self.UESourceCodePath}', '\$', 5)
-		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
-		SSH.command(f'if [ ! -e .git ]; then stdbuf -o0 git clone {full_ran_repo_name} .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		SSH.command('mkdir -p ' + self.UESourceCodePath, '\$', 5)
+		SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
+		SSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
 		# here add a check if git clone or git fetch went smoothly
 		SSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
 		SSH.command('git config user.name "OAI Jenkins"', '\$', 5)
@@ -170,11 +170,11 @@ class OaiCiTest():
 					HTML.CreateHtmlTestRow(self.Build_OAI_UE_args, 'OK', CONST.ALL_PROCESSES_OK)
 					return

-			SSH.command(f'echo {self.UEPassword} | sudo -S git clean -x -d -ff', '\$', 30)
+			SSH.command('echo ' + self.UEPassword + ' | sudo -S git clean -x -d -ff', '\$', 30)

 		# if the commit ID is provided use it to point to it
 		if self.ranCommitID != '':
-			SSH.command(f'git checkout -f {self.ranCommitID}', '\$', 30)
+			SSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
 		# if the branch is not develop, then it is a merge request and we need to do 
 		# the potential merge. Note that merge conflicts should already been checked earlier
 		if self.ranAllowMerge:
@@ -182,33 +182,33 @@ class OaiCiTest():
 				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
 					SSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
 			else:
-				logging.debug(f'Merging with the target branch: {self.ranTargetBranch}')
-				SSH.command(f'git merge --ff origin/{self.ranTargetBranch} -m "Temporary merge for CI"', '\$', 30)
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				SSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
 		SSH.command('source oaienv', '\$', 5)
 		SSH.command('cd cmake_targets', '\$', 5)
 		SSH.command('mkdir -p log', '\$', 5)
 		SSH.command('chmod 777 log', '\$', 5)
 		# no need to remove in log (git clean did the trick)
-		SSH.command(f'stdbuf -o0 ./build_oai {self.Build_OAI_UE_args} 2>&1 | stdbuf -o0 tee compile_oai_ue.log', 'Bypassing the Tests|build have failed', 1200)
+		SSH.command('stdbuf -o0 ./build_oai ' + self.Build_OAI_UE_args + ' 2>&1 | stdbuf -o0 tee compile_oai_ue.log', 'Bypassing the Tests|build have failed', 1200)
 		SSH.command('ls ran_build/build', '\$', 3)
 		SSH.command('ls ran_build/build', '\$', 3)
 		buildStatus = True
 		result = re.search(self.air_interface, SSH.getBefore())
 		if result is None:
 			buildStatus = False
-		SSH.command(f'mkdir -p build_log_{self.testCase_id}', '\$', 5)
-		SSH.command(f'mv log/* build_log_{self.testCase_id}', '\$', 5)
-		SSH.command(f'mv compile_oai_ue.log build_log_{self.testCase_id}', '\$', 5)
+		SSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		SSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		SSH.command('mv compile_oai_ue.log ' + 'build_log_' + self.testCase_id, '\$', 5)
 		if buildStatus:
 			# Generating a BUILD INFO file
-			SSH.command(f'echo "SRC_BRANCH: {self.ranBranch}" > ../LAST_BUILD_INFO.txt', '\$', 2)
-			SSH.command(f'echo "SRC_COMMIT: {self.ranCommitID}" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+			SSH.command('echo "SRC_BRANCH: ' + self.ranBranch + '" > ../LAST_BUILD_INFO.txt', '\$', 2)
+			SSH.command('echo "SRC_COMMIT: ' + self.ranCommitID + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 			if self.ranAllowMerge:
 				SSH.command('echo "MERGED_W_TGT_BRANCH: YES" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 				if self.ranTargetBranch == '':
 					SSH.command('echo "TGT_BRANCH: develop" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 				else:
-					SSH.command(f'echo "TGT_BRANCH: {self.ranTargetBranch}" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+					SSH.command('echo "TGT_BRANCH: ' + self.ranTargetBranch + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 			else:
 				SSH.command('echo "MERGED_W_TGT_BRANCH: NO" >> ../LAST_BUILD_INFO.txt', '\$', 2)
 			SSH.close()
@@ -248,7 +248,7 @@ class OaiCiTest():
 			UE_prefix = 'NR '
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
+		SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
 		# Initialize_OAI_UE_args usually start with -C and followed by the location in repository
 		SSH.command('source oaienv', '\$', 5)
 		SSH.command('cd cmake_targets/ran_build/build', '\$', 5)
@@ -262,11 +262,11 @@ class OaiCiTest():
 					SSH.command('sed -f /tmp/adapt_usim_parameters.sed ../../../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf > ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf', '\$', 5)
 				else:
 					SSH.command('sed -e "s#93#92#" -e "s#8baf473f2f8fd09487cccbd7097c6862#fec86ba6eb707ed08905757b1bb44b8f#" -e "s#e734f8734007d6c5ce7a0508809e7e9c#C42449363BBAD02B66D16BC975D77CC1#" ../../../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf > ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf', '\$', 5)
-				SSH.command(f'echo {self.UEPassword} | sudo -S rm -Rf .u*', '\$', 5)
-				SSH.command(f'echo {self.UEPassword} | sudo -S ../../nas_sim_tools/build/conf2uedata -c ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf -o .', '\$', 5)
+				SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf .u*', '\$', 5)
+				SSH.command('echo ' + self.UEPassword + ' | sudo -S ../../nas_sim_tools/build/conf2uedata -c ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf -o .', '\$', 5)
 		else:
-			SSH.command(f'if [ -e rbconfig.raw ]; then echo {self.UEPassword} | sudo -S rm rbconfig.raw; fi', '\$', 5)
-			SSH.command(f'if [ -e reconfig.raw ]; then echo {self.UEPassword} | sudo -S rm reconfig.raw; fi', '\$', 5)
+			SSH.command('if [ -e rbconfig.raw ]; then echo ' + self.UEPassword + ' | sudo -S rm rbconfig.raw; fi', '\$', 5)
+			SSH.command('if [ -e reconfig.raw ]; then echo ' + self.UEPassword + ' | sudo -S rm reconfig.raw; fi', '\$', 5)
 			# Copy the RAW files from gNB running directory (maybe on another machine)
 			copyin_res = SSH.copyin(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, RAN.eNBSourceCodePath + '/cmake_targets/rbconfig.raw', '.')
 			if (copyin_res == 0):
@@ -275,9 +275,9 @@ class OaiCiTest():
 			if (copyin_res == 0):
 				SSH.copyout(self.UEIPAddress, self.UEUserName, self.UEPassword, './reconfig.raw', self.UESourceCodePath + '/cmake_targets/ran_build/build')
 		SSH.command(f'echo "ulimit -c unlimited && {self.cmd_prefix} ./{self.air_interface} {self.Initialize_OAI_UE_args}" > ./my-lte-uesoftmodem-run{self.UE_instance}.sh', '\$', 5)
-		SSH.command(f'chmod 775 ./my-lte-uesoftmodem-run {self.UE_instance}.sh', '\$', 5)
-		SSH.command(f'echo {self.UEPassword} | sudo -S rm -Rf {self.UESourceCodePath}/cmake_targets/ue_{self.testCase_id}.log', '\$', 5)
-		self.UELogFile = f'ue_{self.testCase_id}.log'
+		SSH.command('chmod 775 ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+		SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
+		self.UELogFile = 'ue_' + self.testCase_id + '.log'

 		# We are now looping several times to hope we really sync w/ an eNB
 		doOutterLoop = True
@@ -285,9 +285,9 @@ class OaiCiTest():
 		gotSyncStatus = True
 		fullSyncStatus = True
 		while (doOutterLoop):
-			SSH.command(f'cd {self.UESourceCodePath}/cmake_targets/ran_build/build', '\$', 5)
-			SSH.command(f'echo {self.UEPassword} | sudo -S rm -Rf {self.UESourceCodePath}/cmake_targets/ue_{self.testCase_id}.log', '\$', 5)
-			SSH.command(f'echo $USER; nohup sudo -E stdbuf -o0 ./my-lte-uesoftmodem-run {self.UE_instance}.sh > {self.UESourceCodePath}/cmake_targets/ue_{self.testCase_id}.log 2>&1 &', self.UEUserName, 5)
+			SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets/ran_build/build', '\$', 5)
+			SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
+			SSH.command('echo $USER; nohup sudo -E stdbuf -o0 ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh' + ' > ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ' + ' 2>&1 &', self.UEUserName, 5)
 			time.sleep(6)
 			SSH.command('cd ../..', '\$', 5)
 			doLoop = True
@@ -302,7 +302,7 @@ class OaiCiTest():
 					gotSyncStatus = False
 					doLoop = False
 					continue
-				SSH.command(f'stdbuf -o0 cat ue_{self.testCase_id}.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
+				SSH.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
 				if self.air_interface == 'nr-uesoftmodem':
 					result = re.search('Starting sync detection', SSH.getBefore())
 				else:
@@ -317,7 +317,7 @@ class OaiCiTest():
 				SSH.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
 				result = re.search('-uesoftmodem', SSH.getBefore())
 				if result is not None:
-					SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal=SIGINT -r *-uesoftmodem', '\$', 4)
+					SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT -r *-uesoftmodem', '\$', 4)
 					time.sleep(3)
 				outterLoopCounter = outterLoopCounter - 1
 				if (outterLoopCounter == 0):
@@ -347,7 +347,7 @@ class OaiCiTest():
 						SSH.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
 						result = re.search('nr-uesoftmodem', SSH.getBefore())
 						if result is not None:
-							SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal=SIGINT nr-uesoftmodem', '\$', 4)
+							SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT nr-uesoftmodem', '\$', 4)
 						time.sleep(6)
 					else:
 						# Here we do have a great chance that the UE did cell-sync w/ eNB
@@ -355,7 +355,7 @@ class OaiCiTest():
 						doOutterLoop = False
 						fullSyncStatus = True
 						continue
-				SSH.command(f'stdbuf -o0 cat ue_{self.testCase_id}.log | egrep --text --color=never -i "wait|sync|Frequency"', '\$', 4)
+				SSH.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync|Frequency"', '\$', 4)
 				if self.air_interface == 'nr-uesoftmodem':
 					# Positive messaging -->
 					result = re.search('Measured Carrier Frequency', SSH.getBefore())
@@ -378,7 +378,7 @@ class OaiCiTest():
 						SSH.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
 						result = re.search('lte-uesoftmodem', SSH.getBefore())
 						if result is not None:
-							SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal=SIGINT lte-uesoftmodem', '\$', 4)
+							SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT lte-uesoftmodem', '\$', 4)
 			outterLoopCounter = outterLoopCounter - 1
 			if (outterLoopCounter == 0):
 				doOutterLoop = False
@@ -543,13 +543,13 @@ class OaiCiTest():
 		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
 		if result is None:
 			message = ue_header + ': Packet Loss Not Found!'
-			logging.error(f'\u001B[1;37;41m {message} \u001B[0m')
+			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
 			return (False, message)
 		packetloss = result.group('packetloss')
 		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 = ue_header + ': Ping RTT_Min RTT_Avg RTT_Max Not Found!'
-			logging.error(f'\u001B[1;37;41m {message} \u001B[0m')
+			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
 			return (False, message)
 		rtt_min = result.group('rtt_min')
 		rtt_avg = result.group('rtt_avg')
@@ -561,10 +561,10 @@ class OaiCiTest():
 		max_msg = f'RTT(Max)   : {rtt_max} ms'

 		logging.info(f'\u001B[1;37;44m ping result for {ue_header} \u001B[0m')
-		logging.info(f'\u001B[1;34m    {pal_msg} \u001B[0m')
-		logging.info(f'\u001B[1;34m    {min_msg} \u001B[0m')
-		logging.info(f'\u001B[1;34m    {avg_msg} \u001B[0m')
-		logging.info(f'\u001B[1;34m    {max_msg} \u001B[0m')
+		logging.info(f'\u001B[1;34m    ' + pal_msg + '\u001B[0m')
+		logging.info(f'\u001B[1;34m    ' + min_msg + '\u001B[0m')
+		logging.info(f'\u001B[1;34m    ' + avg_msg + '\u001B[0m')
+		logging.info(f'\u001B[1;34m    ' + max_msg + '\u001B[0m')

 		message = f'{ue_header}\n{pal_msg}\n{min_msg}\n{avg_msg}\n{max_msg}'

@@ -580,7 +580,7 @@ class OaiCiTest():
 		if self.ping_rttavg_threshold != '':
 			if float(rtt_avg) > float(self.ping_rttavg_threshold):
 				ping_rttavg_error_msg = f'RTT(Avg) too high: {rtt_avg} ms; Target: {self.ping_rttavg_threshold} ms'
-				message += f'\n {ping_rttavg_error_msg}'
+				message += '\n' + ping_rttavg_error_msg
 				logging.error('\u001B[1;37;41m'+ ping_rttavg_error_msg +' \u001B[0m')
 				return (False, message)

@@ -631,8 +631,8 @@ class OaiCiTest():
 				iperf_bandwidth_new = float(iperf_bandwidth) - ((ue_num - 1) * residualBW)
 			else:
 				iperf_bandwidth_new = residualBW
-		iperf_bandwidth_str = f'-b {iperf_bandwidth}'
-		iperf_bandwidth_str_new = f"-b {'%.2f' % iperf_bandwidth_new}"
+		iperf_bandwidth_str = '-b ' + iperf_bandwidth
+		iperf_bandwidth_str_new = '-b ' + ('%.2f' % iperf_bandwidth_new)
 		result = re.sub(iperf_bandwidth_str, iperf_bandwidth_str_new, str(self.iperf_args))
 		if result is None:
 			logging.debug('\u001B[1;37;41m Calculate Iperf bandwidth Failed! \u001B[0m')
@@ -648,17 +648,17 @@ class OaiCiTest():
 			maxbitrate = result.group('maximum')
 			minbitrate = result.group('minimum')
 			lock.acquire()
-			logging.debug(f'\u001B[1;37;44m TCP iperf result ({UE_IPAddress}) \u001B[0m')
+			logging.debug('\u001B[1;37;44m TCP iperf result (' + UE_IPAddress + ') \u001B[0m')
 			msg = 'TCP Stats   :\n'
 			if avgbitrate is not None:
-				logging.debug(f'\u001B[1;34m    Avg Bitrate : {avgbitrate} \u001B[0m')
-				msg += f'Avg Bitrate : {avgbitrate} \n'
+				logging.debug('\u001B[1;34m    Avg Bitrate : ' + avgbitrate + '\u001B[0m')
+				msg += 'Avg Bitrate : ' + avgbitrate + '\n'
 			if maxbitrate is not None:
-				logging.debug(f'\u001B[1;34m    Max Bitrate : {maxbitrate} \u001B[0m')
-				msg += f'Max Bitrate : {maxbitrate} \n'
+				logging.debug('\u001B[1;34m    Max Bitrate : ' + maxbitrate + '\u001B[0m')
+				msg += 'Max Bitrate : ' + maxbitrate + '\n'
 			if minbitrate is not None:
-				logging.debug(f'\u001B[1;34m    Min Bitrate : {minbitrate} \u001B[0m')
-				msg += f'Min Bitrate : {minbitrate} \n'
+				logging.debug('\u001B[1;34m    Min Bitrate : ' + minbitrate + '\u001B[0m')
+				msg += 'Min Bitrate : ' + minbitrate + '\n'
 			statusQueue.put(0)
 			statusQueue.put(device_id)
 			statusQueue.put(UE_IPAddress)
@@ -672,9 +672,9 @@ class OaiCiTest():
 		result = re.search('-u', str(iperf_real_options))
 		if result is None:
 			logging.debug('Into Iperf_analyzeV2TCPOutput client')
-			filename = f'{EPC.SourceCodePath}/scripts/iperf_{self.testCase_id}_{device_id}.log'
+			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(f'Iperf_analyzeV2TCPOutput response returned value = {response}')
+			logging.debug('Iperf_analyzeV2TCPOutput response returned value = ' + str(response))
 			return response

 		result = re.search('Server Report:', SSH.getBefore())
@@ -709,13 +709,13 @@ class OaiCiTest():
 			packetloss = result.group('packetloss')
 			jitter = result.group('jitter')
 			lock.acquire()
-			logging.debug(f'\u001B[1;37;44m iperf result {UE_IPAddress} \u001B[0m')
+			logging.debug('\u001B[1;37;44m iperf result (' + UE_IPAddress + ') \u001B[0m')
 			iperfStatus = True
-			msg = f'Req Bitrate : {req_bandwidth} \n'
-			logging.debug(f'\u001B[1;34m    Req Bitrate : {req_bandwidth} \u001B[0m')
+			msg = 'Req Bitrate : ' + req_bandwidth + '\n'
+			logging.debug('\u001B[1;34m    Req Bitrate : ' + req_bandwidth + '\u001B[0m')
 			if bitrate is not None:
-				msg += f'Bitrate     : {bitrate} \n'
-				logging.debug(f'\u001B[1;34m    Bitrate : {bitrate}  \u001B[0m')
+				msg += 'Bitrate     : ' + bitrate + '\n'
+				logging.debug('\u001B[1;34m    Bitrate     : ' + bitrate + '\u001B[0m')
 				result = re.search('(?P<real_bw>[0-9\.]+) [KMG]bits/sec', str(bitrate))
 				if result is not None:
 					actual_bw = float(str(result.group('real_bw')))
@@ -730,18 +730,18 @@ class OaiCiTest():
 						actual_bw = actual_bw * 1000000000
 					br_loss = 100 * actual_bw / req_bw
 					bitperf = '%.2f ' % br_loss
-					msg += f'Bitrate Perf: {bitperf} %\n'
-					logging.debug(f'\u001B[1;34m    Bitrate Perf: {bitperf} %\u001B[0m')
+					msg += 'Bitrate Perf: ' + bitperf + '%\n'
+					logging.debug('\u001B[1;34m    Bitrate Perf: ' + bitperf + '%\u001B[0m')
 			if packetloss is not None:
-				msg += f'Packet Loss : {packetloss} %\n'
-				logging.debug(f'\u001B[1;34m    Packet Loss : {packetloss} %\u001B[0m')
+				msg += 'Packet Loss : ' + packetloss + '%\n'
+				logging.debug('\u001B[1;34m    Packet Loss : ' + packetloss + '%\u001B[0m')
 				if float(packetloss) > float(self.iperf_packetloss_threshold):
 					msg += 'Packet Loss too high!\n'
 					logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
 					iperfStatus = False
 			if jitter is not None:
-				msg += f'Jitter      : {jitter} \n'
-				logging.debug(f'\u001B[1;34m    Jitter      : {jitter} \u001B[0m')
+				msg += 'Jitter      : ' + jitter + '\n'
+				logging.debug('\u001B[1;34m    Jitter      : ' + jitter + '\u001B[0m')
 			if (iperfStatus):
 				statusQueue.put(0)
 			else:
@@ -785,15 +785,16 @@ class OaiCiTest():
 				if result is not None:
 					report.append(str(line))
 					report_msg+=result.group('role') + ' ' + result.group('direction')+ '\t = ' +result.group('bitrate')+'\n'
+
 		if len(report)>0:
 			lock.acquire()
 			statusQueue.put(0)
 			statusQueue.put(device_id)
 			statusQueue.put(UE_IPAddress)
 			statusQueue.put(report_msg)
-			logging.debug(f'\u001B[1;37;45m TCP Bidir Iperf Result ({UE_IPAddress}) \u001B[0m')
+			logging.debug('\u001B[1;37;45m TCP Bidir Iperf Result (' + UE_IPAddress + ') \u001B[0m')
 			for rLine in report_msg.split('\n'):
-				logging.debug(f'\u001B[1;35m    {rLine} \u001B[0m')
+				logging.debug('\u001B[1;35m    ' + rLine + '\u001B[0m')
 			lock.release()
 		else:
 			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Could not analyze from Log file')
@@ -895,20 +896,20 @@ class OaiCiTest():
 				statusQueue.put(0)
 			statusQueue.put(device_id)
 			statusQueue.put(UE_IPAddress)
-			req_msg = f'Req Bitrate : {req_bandwidth}'
-			bir_msg = f'Bitrate     : {bitrate}'
-			brl_msg = f'Bitrate Perf: {bitperf}'
-			jit_msg = f'Jitter      : {jitter}'
-			pal_msg = f'Packet Loss : {packetloss}'
-			statusQueue.put(f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}\n{pal_too_high_msg}\n{bit_too_low_msg}\n')
-			logging.debug(f'\u001B[1;37;45m iperf result ({UE_IPAddress}) \u001B[0m')
-			logging.debug(f'\u001B[1;35m    {req_msg} \u001B[0m')
-			logging.debug(f'\u001B[1;35m    {bir_msg} \u001B[0m')
-			logging.debug(f'\u001B[1;35m    {brl_msg} \u001B[0m')
-			logging.debug(f'\u001B[1;35m    {jit_msg} \u001B[0m')
-			logging.debug(f'\u001B[1;35m    {pal_msg} \u001B[0m')
-			logging.debug(f'\u001B[1;35m    {pal_too_high_msg} \u001B[0m')
-			logging.debug(f'\u001B[1;35m    {bit_too_low_msg} \u001B[0m')
+			req_msg = 'Req Bitrate : ' + req_bandwidth
+			bir_msg = 'Bitrate     : ' + bitrate
+			brl_msg = 'Bitrate Perf: ' + bitperf
+			jit_msg = 'Jitter      : ' + jitter
+			pal_msg = 'Packet Loss : ' + packetloss
+			statusQueue.put(req_msg + '\n' + bir_msg + '\n' + brl_msg + '\n' + jit_msg + '\n' + pal_msg + '\n' + pal_too_high_msg + '\n' + bit_too_low_msg + '\n')
+			logging.debug('\u001B[1;37;45m iperf result (' + UE_IPAddress + ') \u001B[0m')
+			logging.debug('\u001B[1;35m    ' + req_msg + '\u001B[0m')
+			logging.debug('\u001B[1;35m    ' + bir_msg + '\u001B[0m')
+			logging.debug('\u001B[1;35m    ' + brl_msg + '\u001B[0m')
+			logging.debug('\u001B[1;35m    ' + jit_msg + '\u001B[0m')
+			logging.debug('\u001B[1;35m    ' + pal_msg + '\u001B[0m')
+			logging.debug('\u001B[1;35m    ' + pal_too_high_msg + '\u001B[0m')
+			logging.debug('\u001B[1;35m    ' + bit_too_low_msg + '\u001B[0m')
 			lock.release()
 		else:
 			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not analyze from server log')
@@ -926,7 +927,7 @@ class OaiCiTest():
 			statusQueue.put(device_id)
 			statusQueue.put(UE_IPAddress)
 			if result is not None:
-				logging.debug(f"\u001B[1;37;41m {result.group('error')} \u001B[0m")
+				logging.debug('\u001B[1;37;41m ' + result.group('error') + ' \u001B[0m')
 				statusQueue.put(result.group('error'))
 			else:
 				logging.debug('\u001B[1;37;41m Bitrate and/or Packet Loss Not Found! \u001B[0m')
@@ -936,13 +937,13 @@ class OaiCiTest():
 		bitrate = result.group('bitrate')
 		packetloss = result.group('packetloss')
 		lock.acquire()
-		logging.debug(f'\u001B[1;37;44m iperf result ({UE_IPAddress}) \u001B[0m')
-		logging.debug(f'\u001B[1;34m    Bitrate     : {bitrate} \u001B[0m')
-		msg = f'Bitrate     : {bitrate} \n'
+		logging.debug('\u001B[1;37;44m iperf result (' + UE_IPAddress + ') \u001B[0m')
+		logging.debug('\u001B[1;34m    Bitrate     : ' + bitrate + '\u001B[0m')
+		msg = 'Bitrate     : ' + bitrate + '\n'
 		iperfStatus = True
 		if packetloss is not None:
-			logging.debug(f'\u001B[1;34m    Packet Loss : {packetloss} %\u001B[0m')
-			msg += f'Packet Loss : {packetloss} %\n'
+			logging.debug('\u001B[1;34m    Packet Loss : ' + packetloss + '%\u001B[0m')
+			msg += 'Packet Loss : ' + packetloss + '%\n'
 			if float(packetloss) > float(self.iperf_packetloss_threshold):
 				logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
 				msg += 'Packet Loss too high!\n'
@@ -1101,8 +1102,8 @@ class OaiCiTest():
 			# -B 10.0.1.1 -u -s -i 1 -fm
 			server_options = re.sub('-u.*$', '-u -s -i 1 -fm', str(self.iperf_args))
 			server_options = server_options.replace('-c','-B')
-			SSH.command(f'rm -f /tmp/tmp_iperf_server_{self.testCase_id}.log', '\$', 5)
-			SSH.command(f'echo $USER; nohup iperf {server_options} > /tmp/tmp_iperf_server_{self.testCase_id}.log 2>&1 &', iServerUser, 5)
+			SSH.command('rm -f /tmp/tmp_iperf_server_' + self.testCase_id + '.log', '\$', 5)
+			SSH.command('echo $USER; nohup iperf ' + server_options + ' > /tmp/tmp_iperf_server_' + self.testCase_id + '.log 2>&1 &', iServerUser, 5)
 			time.sleep(0.5)
 			SSH.close()

@@ -1111,13 +1112,13 @@ class OaiCiTest():
 		modified_options = modified_options.replace('-R','')
 		iperf_time = self.Iperf_ComputeTime()
 		SSH.open(iClientIPAddr, iClientUser, iClientPasswd)
-		SSH.command(f'rm -f /tmp/tmp_iperf_{self.testCase_id}.log', '\$', 5)
-		iperf_status = SSH.command(f'stdbuf -o0 iperf {modified_options} 2>&1 | stdbuf -o0 tee /tmp/tmp_iperf_{self.testCase_id}.log', '\$', int(iperf_time)*5.0)
+		SSH.command('rm -f /tmp/tmp_iperf_' + self.testCase_id + '.log', '\$', 5)
+		iperf_status = SSH.command('stdbuf -o0 iperf ' + modified_options + ' 2>&1 | stdbuf -o0 tee /tmp/tmp_iperf_' + self.testCase_id + '.log', '\$', int(iperf_time)*5.0)
 		status_queue = SimpleQueue()
 		lock = Lock()
 		if iperf_status < 0:
 			message = 'iperf on OAI UE crashed due to TIMEOUT !'
-			logging.debug(f'\u001B[1;37;41m {message} \u001B[0m')
+			logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
 			clientStatus = -2
 		else:
 			if self.iperf_options == 'sink':
@@ -1138,20 +1139,20 @@ class OaiCiTest():
 			SSH.close()

 		if (clientStatus == -1):
-			if (os.path.isfile(f'iperf_server_{self.testCase_id}.log')):
-				os.remove(f'iperf_server_{self.testCase_id}.log')
-			SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, f'/tmp/tmp_iperf_server_{self.testCase_id}.log', f'iperf_server_{self.testCase_id}_OAI-UE.log')
-			filename=f'iperf_server_{self.testCase_id}_OAI-UE.log'
+			if (os.path.isfile('iperf_server_' + self.testCase_id + '.log')):
+				os.remove('iperf_server_' + self.testCase_id + '.log')
+			SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, '/tmp/tmp_iperf_server_' + self.testCase_id + '.log', 'iperf_server_' + self.testCase_id + '_OAI-UE.log')
+			filename='iperf_server_' + self.testCase_id + '_OAI-UE.log'
 			self.Iperf_analyzeV2Server(lock, '10.0.1.2', 'OAI-UE', status_queue, modified_options,filename,0)

 		# copying on the EPC server for logCollection
 		if (clientStatus == -1):
-			copyin_res = SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, f'/tmp/tmp_iperf_server_{self.testCase_id}.log', f'iperf_server_{self.testCase_id}_OAI-UE.log')
+			copyin_res = SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, '/tmp/tmp_iperf_server_' + self.testCase_id + '.log', 'iperf_server_' + self.testCase_id + '_OAI-UE.log')
 			if (copyin_res == 0):
-				SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, f'iperf_server_{self.testCase_id}_OAI-UE.log', f'{EPC.SourceCodePath}/scripts')
-		copyin_res = SSH.copyin(iClientIPAddr, iClientUser, iClientPasswd, f'/tmp/tmp_iperf_{self.testCase_id}.log', f'iperf_{self.testCase_id}_OAI-UE.log')
+				SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_server_' + self.testCase_id + '_OAI-UE.log', EPC.SourceCodePath + '/scripts')
+		copyin_res = SSH.copyin(iClientIPAddr, iClientUser, iClientPasswd, '/tmp/tmp_iperf_' + self.testCase_id + '.log', 'iperf_' + self.testCase_id + '_OAI-UE.log')
 		if (copyin_res == 0):
-			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, f'iperf_{self.testCase_id}_OAI-UE.log', f'{EPC.SourceCodePath}/scripts')
+			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_' + self.testCase_id + '_OAI-UE.log', EPC.SourceCodePath + '/scripts')
 		iperf_noperf = False
 		if status_queue.empty():
 			iperf_status = False
@@ -1247,9 +1248,9 @@ class OaiCiTest():
 				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)

 	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
-		if (not os.path.isfile(f'./{UElogFile}')):
+		if (not os.path.isfile('./' + UElogFile)):
 			return -1
-		ue_log_file = open(f'./{UElogFile}', 'r')
+		ue_log_file = open('./' + UElogFile, 'r')
 		exitSignalReceived = False
 		foundAssertion = False
 		msgAssertion = ''
@@ -1351,59 +1352,59 @@ class OaiCiTest():
 				try:
 					mibMsg = "MIB Information: " + result.group(1) + ', ' + result.group(2)
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 					mibMsg = "    nidcell = " + result.group('nidcell')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 					mibMsg = "    n_rb_dl = " + result.group('n_rb_dl')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 					mibMsg = "    phich_duration = " + result.group('phich_duration')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 					mibMsg = "    phich_resource = " + result.group('phich_resource')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 					mibMsg = "    tx_ant = " + result.group('tx_ant')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 					mib_found = True
 				except Exception as e:
-					logging.error(f'\033[91m MIB marker was not found \033[0m')
+					logging.error('\033[91m' + "MIB marker was not found" + '\033[0m')
 			result = re.search("Measured Carrier Frequency (?P<measured_carrier_frequency>\d{1,15}) Hz", str(line))
 			if result is not None and (not frequency_found):
 				try:
-					mibMsg = f"Measured Carrier Frequency = {result.group('measured_carrier_frequency')} Hz"
+					mibMsg = "Measured Carrier Frequency = " + result.group('measured_carrier_frequency') + ' Hz'
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 					frequency_found = True
 				except Exception as e:
-					logging.error(f'\033[91m Measured Carrier Frequency not found \033[0m')
+					logging.error('\033[91m' + "Measured Carrier Frequency not found" + '\033[0m')
 			result = re.search("PLMN MCC (?P<mcc>\d{1,3}), MNC (?P<mnc>\d{1,3}), TAC", str(line))
 			if result is not None and (not plmn_found):
 				try:
-					mibMsg = f"PLMN MCC = {result.group('mcc')} MNC = {result.group('mnc')}"
+					mibMsg = 'PLMN MCC = ' + result.group('mcc') + ' MNC = ' + result.group('mnc')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 					plmn_found = True
 				except Exception as e:
-					logging.error(f'\033[91m PLMN not found \033[0m')
+					logging.error('\033[91m' + "PLMN not found" + '\033[0m')
 			result = re.search("Found (?P<operator>[\w,\s]{1,15}) \(name from internal table\)", str(line))
 			if result is not None:
 				try:
-					mibMsg = f"The operator is: {result.group('operator')}"
+					mibMsg = "The operator is: " + result.group('operator')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 				except Exception as e:
-					logging.error(f'\033[91m Operator name not found \033[0m')
+					logging.error('\033[91m' + "Operator name not found" + '\033[0m')
 			result = re.search("SIB5 InterFreqCarrierFreq element (.{1,4})/(.{1,4})", str(line))
 			if result is not None:
 				try:
-					mibMsg = f'SIB5 InterFreqCarrierFreq element {result.group(1)}/{result.group(2)}'
+					mibMsg = "SIB5 InterFreqCarrierFreq element " + result.group(1) + '/' + result.group(2)
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + ' -> '
-					logging.debug(f'\033[94m{mibMsg}\033[0m')
+					logging.debug('\033[94m' + mibMsg + '\033[0m')
 				except Exception as e:
-					logging.error(f'\033[91m SIB5 InterFreqCarrierFreq element not found \033[0m')
+					logging.error('\033[91m' + "SIB5 InterFreqCarrierFreq element not found" + '\033[0m')
 			result = re.search("DL Carrier Frequency/ARFCN : \-*(?P<carrier_frequency>\d{1,15}/\d{1,4})", str(line))
 			if result is not None:
 				try:
@@ -1411,78 +1412,78 @@ class OaiCiTest():
 					new_freq = re.sub('/[0-9]+','',freq)
 					float_freq = float(new_freq) / 1000000
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz'
-					logging.debug(f'\033[94m    DL Carrier Frequency is:  {freq}\033[0m')
+					logging.debug('\033[94m' + "    DL Carrier Frequency is: " + str(freq) + '\033[0m')
 				except Exception as e:
-					logging.error(f'\033[91m    DL Carrier Frequency not found \033[0m')
+					logging.error('\033[91m' + "    DL Carrier Frequency not found" + '\033[0m')
 			result = re.search("AllowedMeasBandwidth : (?P<allowed_bandwidth>\d{1,7})", str(line))
 			if result is not None:
 				try:
 					prb = result.group('allowed_bandwidth')
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + ' -- PRB: ' + prb + '\n'
-					logging.debug(f'\033[94m    AllowedMeasBandwidth: {prb}\033[0m')
+					logging.debug('\033[94m' + "    AllowedMeasBandwidth: " + prb + '\033[0m')
 				except Exception as e:
-					logging.error(f'\033[91m    AllowedMeasBandwidth not found \033[0m')
+					logging.error('\033[91m' + "    AllowedMeasBandwidth not found" + '\033[0m')
 		ue_log_file.close()
 		if rrcConnectionRecfgComplete > 0:
-			statMsg = f'UE connected to eNB ({rrcConnectionRecfgComplete}) RRCConnectionReconfigurationComplete message(s) generated)'
-			logging.debug(f'\033[94m{statMsg}\033[0m')
+			statMsg = 'UE connected to eNB (' + str(rrcConnectionRecfgComplete) + ' RRCConnectionReconfigurationComplete message(s) generated)'
+			logging.debug('\033[94m' + statMsg + '\033[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if nrUEFlag:
 			if nrDecodeMib > 0:
-				statMsg = f'UE showed {nrDecodeMib} "MIB decode" message(s)'
-				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				statMsg = 'UE showed ' + str(nrDecodeMib) + ' "MIB decode" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if nrFoundDCI > 0:
-				statMsg = f'UE showed {nrFoundDCI} "DCI found" message(s)'
-				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				statMsg = 'UE showed ' + str(nrFoundDCI) + ' "DCI found" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if nrCRCOK > 0:
-				statMsg = f'UE showed {nrCRCOK} "PDSCH decoding" message(s)'
-				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				statMsg = 'UE showed ' + str(nrCRCOK) + ' "PDSCH decoding" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if not frequency_found:
 				statMsg = 'NR-UE could NOT synch!'
-				logging.error(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				logging.error('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if nbPduSessAccept > 0:
-				statMsg = f'UE showed {nbPduSessAccept} "Received PDU Session Establishment Accept" message(s)'
-				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				statMsg = 'UE showed ' + str(nbPduSessAccept) + ' "Received PDU Session Establishment Accept" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 			if nbPduDiscard > 0:
-				statMsg = f'UE showed {nbPduDiscard} "warning: discard PDU, sn out of window" message(s)'
-				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				statMsg = 'UE showed ' + str(nbPduDiscard) + ' "warning: discard PDU, sn out of window" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 				HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if uciStatMsgCount > 0:
-			statMsg = f'UE showed {uciStatMsgCount} "uci->stat" message(s)'
-			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			statMsg = 'UE showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if pdcpDataReqFailedCount > 0:
-			statMsg = f'UE showed {pdcpDataReqFailedCount} "PDCP data request failed" message(s)'
-			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			statMsg = 'UE showed ' + str(pdcpDataReqFailedCount) + ' "PDCP data request failed" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if badDciCount > 0:
-			statMsg = f'UE showed {badDciCount} "bad DCI 1(A)" message(s)'
-			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			statMsg = 'UE showed ' + str(badDciCount) + ' "bad DCI 1(A)" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if f1aRetransmissionCount > 0:
-			statMsg = f'UE showed {f1aRetransmissionCount} "Format1A Retransmission but TBS are different" message(s)'
-			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			statMsg = 'UE showed ' + str(f1aRetransmissionCount) + ' "Format1A Retransmission but TBS are different" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if fatalErrorCount > 0:
-			statMsg = f'UE showed {fatalErrorCount} "FATAL ERROR:" message(s)'
-			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			statMsg = 'UE showed ' + str(fatalErrorCount) + ' "FATAL ERROR:" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if macBsrTimerExpiredCount > 0:
-			statMsg = f'UE showed {fatalErrorCount} "MAC BSR Triggered ReTxBSR Timer expiry" message(s)'
-			logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+			statMsg = 'UE showed ' + str(fatalErrorCount) + ' "MAC BSR Triggered ReTxBSR Timer expiry" message(s)'
+			logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if RAN.eNBmbmsEnables[0]:
 			if mbms_messages > 0:
-				statMsg = f'UE showed {mbms_messages} "TRIED TO PUSH MBMS DATA" message(s)'
-				logging.debug(f'\u001B[1;30;43m{statMsg}\u001B[0m')
+				statMsg = 'UE showed ' + str(mbms_messages) + ' "TRIED TO PUSH MBMS DATA" message(s)'
+				logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
 			else:
 				statMsg = 'UE did NOT SHOW "TRIED TO PUSH MBMS DATA" message(s)'
-				logging.debug(f'\u001B[1;30;41m{statMsg}\u001B[0m')
+				logging.debug('\u001B[1;30;41m ' + statMsg + ' \u001B[0m')
 				global_status = CONST.OAI_UE_PROCESS_NO_MBMS_MSGS
 			HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + statMsg + '\n'
 		if foundSegFault:
@@ -1526,22 +1527,22 @@ class OaiCiTest():
 	def TerminateOAIUE(self,HTML,RAN,EPC,CONTAINERS):
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-		SSH.command(f'cd {self.UESourceCodePath}/cmake_targets', '\$', 5)
+		SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
 		SSH.command('ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
 		result = re.search('-uesoftmodem', SSH.getBefore())
 		if result is not None:
-			SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal SIGINT -r .*-uesoftmodem || true', '\$', 5)
+			SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGINT -r .*-uesoftmodem || true', '\$', 5)
 			time.sleep(10)
 			SSH.command('ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
 			result = re.search('-uesoftmodem', SSH.getBefore())
 			if result is not None:
-				SSH.command(f'echo {self.UEPassword} | sudo -S killall --signal SIGKILL -r .*-uesoftmodem || true', '\$', 5)
+				SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGKILL -r .*-uesoftmodem || true', '\$', 5)
 				time.sleep(5)
-		SSH.command(f'rm -f my-lte-uesoftmodem-run {self.UE_instance}.sh', '\$', 5)
+		SSH.command('rm -f my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
 		SSH.close()
 		result = re.search('ue_', str(self.UELogFile))
 		if result is not None:
-			copyin_res = SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword,f'{self.UESourceCodePath}/cmake_targets/{self.UELogFile}', '.')
+			copyin_res = SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
 			if (copyin_res == -1):
 				logging.debug('\u001B[1;37;41m Could not copy UE logfile to analyze it! \u001B[0m')
 				HTML.htmlUEFailureMsg='Could not copy UE logfile to analyze it!'
@@ -1556,7 +1557,7 @@ class OaiCiTest():
 			else:
 				ueAction = 'Connection'
 			if (logStatus < 0):
-				logging.debug(f'\u001B[1m {ueAction} Failed \u001B[0m')
+				logging.debug('\u001B[1m' + ueAction + ' Failed \u001B[0m')
 				HTML.htmlUEFailureMsg='<b>' + ueAction + ' Failed</b>\n' + HTML.htmlUEFailureMsg
 				HTML.CreateHtmlTestRow('N/A', 'KO', logStatus, 'UE')
 				if self.air_interface == 'lte-uesoftmodem':
@@ -1570,7 +1571,7 @@ class OaiCiTest():
 						self.Initialize_OAI_UE_args = ''
 						self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 			else:
-				logging.debug(f'\u001B[1m {ueAction} Completed \u001B[0m')
+				logging.debug('\u001B[1m' + ueAction + ' Completed \u001B[0m')
 				HTML.htmlUEFailureMsg='<b>' + ueAction + ' Completed</b>\n' + HTML.htmlUEFailureMsg
 				HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 			self.UELogFile = ''
@@ -1595,7 +1596,7 @@ class OaiCiTest():
 			#terminate all RAN nodes eNB/gNB/OCP
 			for instance in range(0, len(RAN.air_interface)):
 				if RAN.air_interface[instance]!='':
-					logging.debug(f'Auto Termination of Instance {instance} : {RAN.air_interface[instance]}')
+					logging.debug('Auto Termination of Instance ' + str(instance) + ' : ' + RAN.air_interface[instance])
 					RAN.eNB_instance=instance
 					RAN.TerminateeNB(HTML,EPC)
 		if CONTAINERS.yamlPath[0] != '':
@@ -1622,7 +1623,7 @@ class OaiCiTest():
 			#terminate all RAN nodes eNB/gNB/OCP
 			for instance in range(0, len(RAN.air_interface)):
 				if RAN.air_interface[instance]!='':
-					logging.debug(f'Auto Termination of Instance {instance} : {RAN.air_interface[instance]}')
+					logging.debug('Auto Termination of Instance ' + str(instance) + ' : ' + RAN.air_interface[instance])
 					RAN.eNB_instance=instance
 					RAN.TerminateeNB(HTML,EPC)
 		if CONTAINERS.yamlPath[0] != '':
@@ -1684,7 +1685,7 @@ class OaiCiTest():
 	def Perform_X2_Handover(self,HTML,RAN,EPC):
 		html_queue = SimpleQueue()
 		fullMessage = '<pre style="background-color:white">'
-		msg = f'Doing X2 Handover w/ option {self.x2_ho_options}'
+		msg = 'Doing X2 Handover w/ option ' + self.x2_ho_options
 		logging.debug(msg)
 		fullMessage += msg + '\n'
 		if self.x2_ho_options == 'network':
@@ -1710,7 +1711,7 @@ class OaiCiTest():
 			sys.exit('Insufficient Parameter')
 		SSH = sshconnection.SSHConnection()
 		SSH.open(IPAddress, UserName, Password)
-		SSH.command(f'cd {SourceCodePath}', '\$', 5)
+		SSH.command('cd ' + SourceCodePath, '\$', 5)
 		SSH.command('cd cmake_targets', '\$', 5)
 		SSH.command('rm -f build.log.zip', '\$', 5)
 		SSH.command('zip -r build.log.zip build_log_*/*', '\$', 60)
@@ -1723,7 +1724,7 @@ class OaiCiTest():
 			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
+		SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
 		SSH.command('cd scripts', '\$', 5)
 		SSH.command('rm -f ping.log.zip', '\$', 5)
 		SSH.command('zip ping.log.zip ping*.log', '\$', 60)
@@ -1737,7 +1738,7 @@ class OaiCiTest():
 			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
+		SSH.command('cd ' + EPC.SourceCodePath, '\$', 5)
 		SSH.command('cd scripts', '\$', 5)
 		SSH.command('rm -f iperf.log.zip', '\$', 5)
 		SSH.command('zip iperf.log.zip iperf*.log', '\$', 60)
@@ -1751,11 +1752,11 @@ class OaiCiTest():
 			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
-		SSH.command(f'cd cmake_targets', '\$', 5)
-		SSH.command(f'echo {self.UEPassword} | sudo -S rm -f ue.log.zip', '\$', 5)
-		SSH.command(f'echo {self.UEPassword} | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
-		SSH.command(f'echo {self.UEPassword} | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
+		SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
+		SSH.command('cd cmake_targets', '\$', 5)
+		SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -f ue.log.zip', '\$', 5)
+		SSH.command('echo ' + self.UEPassword + ' | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
+		SSH.command('echo ' + self.UEPassword + ' | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
 		SSH.close()

 	def ConditionalExit(self):
@@ -1765,7 +1766,7 @@ class OaiCiTest():
 		sys.exit(1)

 	def ShowTestID(self):
-		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
-		logging.info(f'\u001B[1m Test ID: {self.testCase_id} \u001B[0m')
-		logging.info(f'\u001B[1m {self.desc} \u001B[0m')
-		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
+		logging.info('\u001B[1m----------------------------------------\u001B[0m')
+		logging.info('\u001B[1mTest ID:' + self.testCase_id + '\u001B[0m')
+		logging.info('\u001B[1m' + self.desc + '\u001B[0m')
+		logging.info('\u001B[1m----------------------------------------\u001B[0m')
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -42,10 +42,9 @@ from multiprocessing import Process, Lock, SimpleQueue
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
+import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
-import cls_cmd
-from cls_containerize import CreateWorkspace

 #-----------------------------------------------------------
 # Class Declaration
@@ -96,31 +95,53 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		self.testCase_id = HTML.testCase_id
+
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
+		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+		mySSH.command('cd ' + lSourcePath, '\$', 5)
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		# Raphael: here add a check if git clone or git fetch went smoothly
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)

-		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
+		# if the commit ID is provided use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		if (self.ranAllowMerge):
+			if self.ranTargetBranch == '':
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+			else:
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)

-		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
-		cmd.run(f'sed -e "s@xenial@bionic@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic')
-		cmd.run(f'docker build --tag oai-cppcheck:bionic --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic . > {logDir}/cppcheck-bionic.txt 2>&1')
-		cmd.run(f'sed -e "s@xenial@focal@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal')
-		cmd.run(f'docker build --tag oai-cppcheck:focal --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal . > {logDir}/cppcheck-focal.txt 2>&1')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 60)
+		mySSH.command('sed -e "s@xenial@bionic@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.bionic', '\$', 6)
+		mySSH.command('docker build --tag oai-cppcheck:bionic --file ci-scripts/docker/Dockerfile.cppcheck.bionic . > cmake_targets/log/cppcheck-bionic.txt 2>&1', '\$', 600)
+		mySSH.command('sed -e "s@xenial@focal@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.focal', '\$', 6)
+		mySSH.command('docker build --tag oai-cppcheck:focal --file ci-scripts/docker/Dockerfile.cppcheck.focal . > cmake_targets/log/cppcheck-focal.txt 2>&1', '\$', 600)
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 30)

 		# Analyzing the logs
-		cmd.copyin(f'{logDir}/cppcheck-bionic.txt', 'cppcheck-bionic.txt')
-		cmd.copyin(f'{logDir}/cppcheck-focal.txt', 'cppcheck-focal.txt')
-		cmd.close()
+		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		mySSH.close()

+		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')
 		CCR = CppCheckResults()
 		CCR_ref = CppCheckResults()
 		vId = 0
@@ -230,37 +251,57 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		self.testCase_id = HTML.testCase_id
+
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
+		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+		mySSH.command('cd ' + lSourcePath, '\$', 5)
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		# Raphael: here add a check if git clone or git fetch went smoothly
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)

-		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-		check_options = ''
-		if self.ranAllowMerge:
-			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'
+		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
+		# if the commit ID is provided use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		argToPass = ''
+		if (self.ranAllowMerge):
+			argToPass = '--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH=' + self.ranBranch
 			if self.ranTargetBranch == '':
-				if self.ranBranch != 'develop' and self.ranBranch != 'origin/develop':
-					check_options += ' --build-arg TARGET_BRANCH=develop'
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+					argToPass += ' --build-arg TARGET_BRANCH=develop '
 			else:
-				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+				argToPass += ' --build-arg TARGET_BRANCH=' + self.ranTargetBranch + ' '

-		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic . > {logDir}/oai-formatting-check.txt 2>&1')
+		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
+		mySSH.command('docker build --target oai-formatting-check --tag oai-formatting-check:latest ' + argToPass + '--file ci-scripts/docker/Dockerfile.formatting.bionic . > cmake_targets/log/oai-formatting-check.txt 2>&1', '\$', 600)

-		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run('docker image prune --force')
-		cmd.run('docker volume prune --force')
+		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
+		mySSH.command('docker image prune --force', '\$', 60)
+		mySSH.command('docker volume prune --force', '\$', 60)

 		# Analyzing the logs
-		cmd.copyin(f'{logDir}/oai-formatting-check.txt', 'oai-formatting-check.txt')
-		cmd.close()
+		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		mySSH.close()
+
+		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')

 		finalStatus = 0
 		if (os.path.isfile('./oai-formatting-check.txt')):
--- a/ci-scripts/conf_files/README.md
+++ b/ci-scripts/conf_files/README.md
@@ -29,8 +29,7 @@ Examples:
 - standard monolithic gNB, 2x2 configuration, with SDAP: `gnb.sa.band78.162prb.usrpn310.2x2-sdap.conf`
 - gNB-CU: `gnb-cu.sa.f1.conf`
 - monolithic gNB, L2sim: `gnb.sa.band77.106prb.l2sim.conf`
- monolithic eNB: `enb.band7.25prb.usrpb200.conf`
- RCC (4G eNB with IF4.5 split): `enb-rcc.band7.25prb.tm1.if4p5.conf`
+- RCC (4G eNB with IF4.5 split): `enb.band40.25prb.if45.tm1-fairscheduler.conf`

 Notes:
 - there is no need for TDD/FDD, this is encoded in the band number
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
@@ -1,247 +0,0 @@
-Active_gNBs = ( "gNB-in-docker");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-in-docker";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3300.30 MHz + (19 PRBs + 10 SCs)@30kHz SCS (GSCN: 7715)
-      absoluteFrequencySSB                                             = 641280;
-      dl_frequencyBand                                                 = 78;
-      # this is 3300.30 MHz
-      dl_absoluteFrequencyPointA                                       = 640008;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                     = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-# SC-FDMA: 0 = enabled, 1 = disabled
-      msg3_transformPrecoder                                        = 0;
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-  ul_prbblack_SNR_threshold   = 10;
-  ulsch_max_frame_inactivity  = 10;
-  ul_max_mcs                  = 9;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 100;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 14;
-  att_rx         = 14;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  eNB_instances  = [0];
-  #beamforming 1x4 matrix:
-  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-  clock_src = "internal";
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="info";
-  f1ap_log_level                        ="info";
-};
--- a/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf
+++ b/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf
--- a/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -0,0 +1,225 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
+
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                                         = "NGFI_RCC_IF4p5";
+        node_timing                                           = "synch_to_ext_device";
+        node_synch_ref                                        = 0;
+        frame_type					      = "TDD";
+        tdd_config 					      = 1;
+        tdd_config_s            			      = 0;
+        prefix_type             			      = "NORMAL";
+        eutra_band              			      = 40;
+        downlink_frequency      			      = 2350000000L;
+        uplink_frequency_offset 			      = 0;
+        Nid_cell					      = 0;
+        N_RB_DL                 			      = 100;
+        Nid_cell_mbsfn          			      = 0;
+        nb_antenna_ports          			      = 1;
+        nb_antennas_tx          			      = 1;
+        nb_antennas_rx          			      = 1;
+        tx_gain                                            = 90;
+        rx_gain                                            = 125;
+        prach_root              			      = 0;
+        prach_config_index      			      = 0;
+        prach_high_speed        			      = "DISABLE";
+        prach_zero_correlation  			      = 1;
+        prach_freq_offset       			      = 2;
+        pucch_delta_shift       			      = 1;
+        pucch_nRB_CQI           			      = 1;
+        pucch_nCS_AN            			      = 0;
+        pucch_n1_AN             			      = 0;
+        pdsch_referenceSignalPower 			      =-29;
+        pdsch_p_b                  			      = 0;
+        pusch_n_SB                 			      = 1;
+        pusch_enable64QAM          			      = "DISABLE";
+        pusch_hoppingMode                                  = "interSubFrame";
+        pusch_hoppingOffset                                = 0;
+        pusch_groupHoppingEnabled  			      = "ENABLE";
+        pusch_groupAssignment      			      = 0;
+        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+        pusch_nDMRS1                                       = 1;
+        phich_duration                                     = "NORMAL";
+        phich_resource                                     = "ONESIXTH";
+        srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+        srs_SubframeConfig                                 =;
+        srs_ackNackST                                      =;
+        srs_MaxUpPts                                       =;*/
+
+        pusch_p0_Nominal                                   = -96;
+        pusch_alpha                                        = "AL1";
+        pucch_p0_Nominal                                   = -106;
+        msg3_delta_Preamble                                = 6;
+        pucch_deltaF_Format1                               = "deltaF2";
+        pucch_deltaF_Format1b                              = "deltaF3";
+        pucch_deltaF_Format2                               = "deltaF0";
+        pucch_deltaF_Format2a                              = "deltaF0";
+        pucch_deltaF_Format2b		    	      = "deltaF0";
+
+        rach_numberOfRA_Preambles                          = 64;
+        rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+        rach_sizeOfRA_PreamblesGroupA                      = ;
+        rach_messageSizeGroupA                             = ;
+        rach_messagePowerOffsetGroupB                      = ;
+      */
+        rach_powerRampingStep                              = 4;
+        rach_preambleInitialReceivedTargetPower            = -108;
+        rach_preambleTransMax                              = 10;
+        rach_raResponseWindowSize                          = 10;
+        rach_macContentionResolutionTimer                  = 48;
+        rach_maxHARQ_Msg3Tx                                = 4;
+
+        pcch_default_PagingCycle                           = 128;
+        pcch_nB                                            = "oneT";
+        bcch_modificationPeriodCoeff			      = 2;
+        ue_TimersAndConstants_t300			      = 1000;
+        ue_TimersAndConstants_t301			      = 1000;
+        ue_TimersAndConstants_t310			      = 1000;
+        ue_TimersAndConstants_t311			      = 10000;
+        ue_TimersAndConstants_n310			      = 20;
+        ue_TimersAndConstants_n311			      = 1;
+
+	ue_TransmissionMode				      = 1;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    enable_measurement_reports = "no";
+
+    ///X2
+    enable_x2 = "no";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+
+    log_config :
+    {
+      global_log_level                      ="debug";
+      hw_log_level                          ="info";
+      phy_log_level                         ="info";
+      mac_log_level                         ="info";
+      rlc_log_level                         ="info";
+      pdcp_log_level                        ="info";
+      rrc_log_level                         ="info";
+   };
+
+  }
+);
+MACRLCs = (
+	{
+        num_cc = 1;
+        tr_s_preference = "local_L1";
+        tr_n_preference = "local_RRC";
+        scheduler_mode = "fairRR";
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
+        }  
+);
+
+L1s = (
+    	{
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+        }  
+);
+
+RUs = (
+    {		  
+        local_if_name  = "lo";
+        remote_address = "127.0.0.2";
+        local_address  = "127.0.0.1";
+        local_portc    = 50000;
+        remote_portc   = 50000;
+        local_portd    = 50001;
+        remote_portd   = 50001;
+        local_rf       = "no"
+        tr_preference  = "udp_if4p5"
+        nb_tx          = 1
+        nb_rx          = 1
+        att_tx         = 0
+        att_rx         = 0;
+        eNB_instances  = [0];
+    }
+);  
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
--- a/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf
+++ b/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "rcc-in-docker");
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

@@ -13,7 +13,7 @@ eNBs =

    cell_type =  "CELL_MACRO_ENB";

-    eNB_name  =  "rcc-in-docker";
+    eNB_name  =  "eNB_Eurecom_LTEBox";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code = 1;
@@ -137,7 +137,7 @@ eNBs =
    };

    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              port       = 36412 ;
                              active     = "yes";
@@ -157,17 +157,17 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

    log_config :
    {
-      global_log_level                      ="info";
+      global_log_level                      ="debug";
      hw_log_level                          ="info";
      phy_log_level                         ="info";
      mac_log_level                         ="info";
@@ -200,7 +200,7 @@ RUs = (
  {
    local_if_name  = "lo";
    remote_address = "127.0.0.2";
-    local_address  = "127.0.0.3";
+    local_address  = "127.0.0.1";
    local_portc    = 50000;
    remote_portc   = 50000;
    local_portd    = 50001;
--- a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -0,0 +1,225 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
+
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                                         = "NGFI_RCC_IF4p5";
+        node_timing                                           = "synch_to_ext_device";
+        node_synch_ref                                        = 0;
+        frame_type					      = "TDD";
+        tdd_config 					      = 1;
+        tdd_config_s            			      = 0;
+        prefix_type             			      = "NORMAL";
+        eutra_band              			      = 40;
+        downlink_frequency      			      = 2350000000L;
+        uplink_frequency_offset 			      = 0;
+        Nid_cell					      = 0;
+        N_RB_DL                 			      = 50;
+        Nid_cell_mbsfn          			      = 0;
+        nb_antenna_ports          			      = 1;
+        nb_antennas_tx          			      = 1;
+        nb_antennas_rx          			      = 1;
+        tx_gain                                            = 90;
+        rx_gain                                            = 125;
+        prach_root              			      = 0;
+        prach_config_index      			      = 0;
+        prach_high_speed        			      = "DISABLE";
+        prach_zero_correlation  			      = 1;
+        prach_freq_offset       			      = 2;
+        pucch_delta_shift       			      = 1;
+        pucch_nRB_CQI           			      = 1;
+        pucch_nCS_AN            			      = 0;
+        pucch_n1_AN             			      = 0;
+        pdsch_referenceSignalPower 			      =-27;
+        pdsch_p_b                  			      = 0;
+        pusch_n_SB                 			      = 1;
+        pusch_enable64QAM          			      = "DISABLE";
+        pusch_hoppingMode                                  = "interSubFrame";
+        pusch_hoppingOffset                                = 0;
+        pusch_groupHoppingEnabled  			      = "ENABLE";
+        pusch_groupAssignment      			      = 0;
+        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+        pusch_nDMRS1                                       = 1;
+        phich_duration                                     = "NORMAL";
+        phich_resource                                     = "ONESIXTH";
+        srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+        srs_SubframeConfig                                 =;
+        srs_ackNackST                                      =;
+        srs_MaxUpPts                                       =;*/
+
+        pusch_p0_Nominal                                   = -96;
+        pusch_alpha                                        = "AL1";
+        pucch_p0_Nominal                                   = -106;
+        msg3_delta_Preamble                                = 6;
+        pucch_deltaF_Format1                               = "deltaF2";
+        pucch_deltaF_Format1b                              = "deltaF3";
+        pucch_deltaF_Format2                               = "deltaF0";
+        pucch_deltaF_Format2a                              = "deltaF0";
+        pucch_deltaF_Format2b		    	      = "deltaF0";
+
+        rach_numberOfRA_Preambles                          = 64;
+        rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+        rach_sizeOfRA_PreamblesGroupA                      = ;
+        rach_messageSizeGroupA                             = ;
+        rach_messagePowerOffsetGroupB                      = ;
+      */
+        rach_powerRampingStep                              = 4;
+        rach_preambleInitialReceivedTargetPower            = -108;
+        rach_preambleTransMax                              = 10;
+        rach_raResponseWindowSize                          = 10;
+        rach_macContentionResolutionTimer                  = 48;
+        rach_maxHARQ_Msg3Tx                                = 4;
+
+        pcch_default_PagingCycle                           = 128;
+        pcch_nB                                            = "oneT";
+        bcch_modificationPeriodCoeff			      = 2;
+        ue_TimersAndConstants_t300			      = 1000;
+        ue_TimersAndConstants_t301			      = 1000;
+        ue_TimersAndConstants_t310			      = 1000;
+        ue_TimersAndConstants_t311			      = 10000;
+        ue_TimersAndConstants_n310			      = 20;
+        ue_TimersAndConstants_n311			      = 1;
+
+	ue_TransmissionMode				      = 1;
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    enable_measurement_reports = "no";
+
+    ///X2
+    enable_x2 = "no";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+
+    log_config :
+    {
+      global_log_level                      ="debug";
+      hw_log_level                          ="info";
+      phy_log_level                         ="info";
+      mac_log_level                         ="info";
+      rlc_log_level                         ="info";
+      pdcp_log_level                        ="info";
+      rrc_log_level                         ="info";
+   };
+
+  }
+);
+MACRLCs = (
+	{
+        num_cc = 1;
+        tr_s_preference = "local_L1";
+        tr_n_preference = "local_RRC";
+        scheduler_mode = "fairRR";
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
+        }  
+);
+
+L1s = (
+    	{
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+        }  
+);
+
+RUs = (
+    {		  
+        local_if_name  = "lo";
+        remote_address = "127.0.0.2";
+        local_address  = "127.0.0.1";
+        local_portc    = 50000;
+        remote_portc   = 50000;
+        local_portd    = 50001;
+        remote_portd   = 50001;
+        local_rf       = "no"
+        tr_preference  = "udp_if4p5"
+        nb_tx          = 1
+        nb_rx          = 1
+        att_tx         = 6
+        att_rx         = 6;
+        eNB_instances  = [0];
+    }
+);  
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
@@ -0,0 +1,262 @@
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
+
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      node_function             = "NGFI_RCC_IF4p5";
+      node_timing               = "synch_to_ext_device";
+      node_synch_ref            = 0;
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 7;
+      downlink_frequency      			      = 2680000000L;
+      uplink_frequency_offset 			      = -120000000;
+      Nid_cell					      = 0;
+      N_RB_DL                 			      = 100;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antenna_ports                                = 1;
+      nb_antennas_tx          			      = 1;
+      nb_antennas_rx          			      = 1;
+      tx_gain                                            = 90;
+      rx_gain                                            = 125;
+      pbch_repetition                                 = "FALSE";
+      prach_root              			      = 0;
+      prach_config_index      			      = 0;
+      prach_high_speed        			      = "DISABLE";
+      prach_zero_correlation  			      = 1;
+      prach_freq_offset       			      = 2;
+      pucch_delta_shift       			      = 1;
+      pucch_nRB_CQI           			      = 0;
+      pucch_nCS_AN            			      = 0;
+      pucch_n1_AN             			      = 0;
+      pdsch_referenceSignalPower 			      = -29;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -96;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -104;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+      ue_TransmissionMode                                    = 1;
+
+      //Parameters for SIB18
+      rxPool_sc_CP_Len                                       = "normal";
+      rxPool_sc_Period                                       = "sf40";
+      rxPool_data_CP_Len                                     = "normal";
+      rxPool_ResourceConfig_prb_Num                          = 20;
+      rxPool_ResourceConfig_prb_Start                        = 5;
+      rxPool_ResourceConfig_prb_End                          = 44;
+      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+      rxPool_dataHoppingConfig_rbOffset                               = 0;
+      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+*/
+      // Parameters for SIB19
+      discRxPool_cp_Len                                               = "normal"
+      discRxPool_discPeriod                                           = "rf32"
+      discRxPool_numRetx                                              = 1;
+      discRxPool_numRepetition                                        = 2;
+      discRxPool_ResourceConfig_prb_Num                               = 5;
+      discRxPool_ResourceConfig_prb_Start                             = 3;
+      discRxPool_ResourceConfig_prb_End                               = 21;
+      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    enable_measurement_reports = "no";
+
+    ///X2
+    enable_x2 = "no";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+  }
+);
+
+MACRLCs = (
+	{
+	num_cc = 1;
+	tr_s_preference = "local_L1";
+	tr_n_preference = "local_RRC";
+	phy_test_mode = 0;
+        puSch10xSnr     =  160;
+        puCch10xSnr     =  160;
+        }
+);
+
+L1s = (
+      {
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+      }
+);
+
+RUs = (
+    {
+        local_if_name  = "lo";
+        remote_address = "127.0.0.2";
+        local_address  = "127.0.0.1";
+        local_portc    = 50000;
+        remote_portc   = 50000;
+        local_portd    = 50001;
+        remote_portd   = 50001;
+        local_rf       = "no"
+        tr_preference  = "udp_if4p5"
+        nb_tx          = 1
+        nb_rx          = 1
+        att_tx         = 0
+        att_rx         = 0;
+        eNB_instances  = [0];
+    }
+);
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+    };
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
@@ -1,4 +1,4 @@
-Active_eNBs = ( "rcc-in-docker");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

@@ -13,7 +13,7 @@ eNBs =

    cell_type =  "CELL_MACRO_ENB";

-    eNB_name  =  "rcc-in-docker";
+    eNB_name  =  "eNB-Eurecom-LTEBox";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code = 1;
@@ -174,7 +174,7 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              port       = 36412 ;
                              active     = "yes";
@@ -194,11 +194,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }
@@ -226,7 +226,7 @@ RUs = (
    {
        local_if_name  = "lo";
        remote_address = "127.0.0.2";
-        local_address  = "127.0.0.3";
+        local_address  = "127.0.0.1";
        local_portc    = 50000;
        remote_portc   = 50000;
        local_portd    = 50001;
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
@@ -0,0 +1,262 @@
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
+
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      node_function             = "NGFI_RCC_IF4p5";
+      node_timing               = "synch_to_ext_device";
+      node_synch_ref            = 0;
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 7;
+      downlink_frequency      			      = 2680000000L;
+      uplink_frequency_offset 			      = -120000000;
+      Nid_cell					      = 0;
+      N_RB_DL                 			      = 50;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antenna_ports                                = 1;
+      nb_antennas_tx          			      = 1;
+      nb_antennas_rx          			      = 1;
+      tx_gain                                            = 90;
+      rx_gain                                            = 125;
+      pbch_repetition                                 = "FALSE";
+      prach_root              			      = 0;
+      prach_config_index      			      = 0;
+      prach_high_speed        			      = "DISABLE";
+      prach_zero_correlation  			      = 1;
+      prach_freq_offset       			      = 2;
+      pucch_delta_shift       			      = 1;
+      pucch_nRB_CQI           			      = 0;
+      pucch_nCS_AN            			      = 0;
+      pucch_n1_AN             			      = 0;
+      pdsch_referenceSignalPower 			      = -27;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -96;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -104;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+      ue_TransmissionMode                                    = 1;
+
+      //Parameters for SIB18
+      rxPool_sc_CP_Len                                       = "normal";
+      rxPool_sc_Period                                       = "sf40";
+      rxPool_data_CP_Len                                     = "normal";
+      rxPool_ResourceConfig_prb_Num                          = 20;
+      rxPool_ResourceConfig_prb_Start                        = 5;
+      rxPool_ResourceConfig_prb_End                          = 44;
+      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+      rxPool_dataHoppingConfig_rbOffset                               = 0;
+      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+*/
+      // Parameters for SIB19
+      discRxPool_cp_Len                                               = "normal"
+      discRxPool_discPeriod                                           = "rf32"
+      discRxPool_numRetx                                              = 1;
+      discRxPool_numRepetition                                        = 2;
+      discRxPool_ResourceConfig_prb_Num                               = 5;
+      discRxPool_ResourceConfig_prb_Start                             = 3;
+      discRxPool_ResourceConfig_prb_End                               = 21;
+      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    enable_measurement_reports = "no";
+
+    ///X2
+    enable_x2 = "no";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+    };
+  }
+);
+
+MACRLCs = (
+	{
+	num_cc = 1;
+	tr_s_preference = "local_L1";
+	tr_n_preference = "local_RRC";
+	phy_test_mode = 0;
+        puSch10xSnr     =  160;
+        puCch10xSnr     =  160;
+        }
+);
+
+L1s = (
+      {
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+      }
+);
+
+RUs = (
+    {
+        local_if_name  = "lo";
+        remote_address = "127.0.0.2";
+        local_address  = "127.0.0.1";
+        local_portc    = 50000;
+        remote_portc   = 50000;
+        local_portd    = 50001;
+        remote_portd   = 50001;
+        local_rf       = "no"
+        tr_preference  = "udp_if4p5"
+        nb_tx          = 1
+        nb_rx          = 1
+        att_tx         = 0
+        att_rx         = 0;
+        eNB_instances  = [0];
+    }
+);
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+    };
--- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
+++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
--- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
+++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
--- a/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf
--- a/ci-scripts/conf_files/untested/rru.band38.tm1.master.conf
+++ b/ci-scripts/conf_files/untested/rru.band38.tm1.master.conf
--- a/ci-scripts/conf_files/untested/rru.band38.tm1.slave.conf
+++ b/ci-scripts/conf_files/untested/rru.band38.tm1.slave.conf
--- a/ci-scripts/conf_files/enb-rru.band7.usrpb210.tm1.conf
+++ b/ci-scripts/conf_files/enb-rru.band7.usrpb210.tm1.conf
@@ -2,7 +2,7 @@ RUs =
 (
  {
    local_if_name                 = "lo";
-    remote_address                = "127.0.0.3"
+    remote_address                = "127.0.0.1"
    local_address                 = "127.0.0.2";
    local_portc                   = 50000;
    remote_portc                  = 50000;
@@ -13,7 +13,7 @@ RUs =
    nb_tx                         = 1;
    nb_rx                         = 1;
    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 125;
+    max_rxgain                    = 115;
    bands                         = [7];
  }
 );
--- a/ci-scripts/conf_files/enb-rru.band40.usrpb210.tm1.conf
+++ b/ci-scripts/conf_files/enb-rru.band40.usrpb210.tm1.conf
@@ -2,7 +2,7 @@ RUs =
 (
  {
    local_if_name                 = "lo";
-    remote_address                = "127.0.0.3"
+    remote_address                = "127.0.0.1"
    local_address                 = "127.0.0.2";
    local_portc                   = 50000;
    remote_portc                  = 50000;
@@ -13,7 +13,7 @@ RUs =
    nb_tx                         = 1;
    nb_rx                         = 1;
    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 125;
+    max_rxgain                    = 115;
    bands                         = [40];
  }
 );
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -16,9 +16,9 @@ Ref :
  L1 Rx processing : 305.0
  PUSCH inner-receiver : 150.0
  PUSCH decoding : 210.0
-  Schedule Response : 30.0
+  Schedule Response : 20.0
  DL & UL scheduling timing : 10.0
-  UL Indication : 40.0
+  UL Indication : 30.0
 Threshold :
  feprx : 1.25
  feptx_prec : 1.25
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -166,8 +166,6 @@ class EPCManagement():
 			mySSH.command('echo ' + self.Password + ' | sudo -S ./run_mme 2>&1 | stdbuf -o0 tee -a mme_' + self.testCase_id + '.log &', 'MME app initialization complete', 100)
 		elif re.match('ltebox', self.Type, re.IGNORECASE):
 			mySSH.command('cd /opt/ltebox/tools', '\$', 5)
-			# Clean-up the logs from previous runs
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm -f ../var/log/*.0', '\$', 5)
 			mySSH.command('echo ' + self.Password + ' | sudo -S ./start_mme', '\$', 5)
 		else:
 			logging.error('This option should not occur!')
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -895,7 +895,7 @@ class RANManagement():
 						htmleNBFailureMsg += '<span class="glyphicon glyphicon-ok-circle"></span> Command line option(s) correctly applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
 					else:
 						htmleNBFailureMsg += '<span class="glyphicon glyphicon-ban-circle"></span> Command line option(s) NOT applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
-			result = re.search('Exiting OAI softmodem|Caught SIGTERM, shutting down', str(line))
+			result = re.search('Exiting OAI softmodem', str(line))
 			if result is not None:
 				exitSignalReceived = True
 			result = re.search('[Ss]egmentation [Ff]ault', str(line))
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -39,12 +39,6 @@
 020004
 030001
 030002
- 444444
- 333333
- 020005
- 444444
- 333333
- 020005
 100001
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -128,14 +122,6 @@
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

-        <testCase id="020005">
-                <class>Ping</class>
-                <desc>Ping ext-dn from both UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <ping_args>-c 20 192.168.72.135</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
        <testCase id="030001">
                <class>IperfFromContainer</class>
                <desc>Iperf UDP Downlink</desc>
@@ -154,18 +140,6 @@
                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
        </testCase>

-        <testCase id="333333">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE 1 and 2</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-        </testCase>
-
-        <testCase id="444444">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UE 1 and 2</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-        </testCase>
-
        <testCase id="100001">
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
@@ -1,184 +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-fdd-05-tm1-if4-5</htmlTabRef>
-    <htmlTabName>Test-FDD-05MHz-TM1-IF4.5</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-300000
-040101
-030131 030132
-040301 040531 040633 040634 040636 040671 040672 040673 040401 040201
-030231
-200000
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
-    </testCase>
-
-    <testCase id="100000">
-        <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>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</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="030131">
-        <class>Deploy_Object</class>
-        <desc>Deploy RRU (FDD/Band7/5MHz/B200) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
-        <services>rru_fdd</services>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="030132">
-        <class>Deploy_Object</class>
-        <desc>Deploy RCC (FDD/Band7/5MHz) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
-        <services>rcc_fdd</services>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030231">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy RCC/RRU</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <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 UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <desc>Detach UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="040531">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20 %cn_ip%</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="040633">
-        <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>
-        <direction>DL</direction>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="040634">
-        <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>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
-    </testCase>
-
-    <testCase id="040636">
-        <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>
-        <direction>DL</direction>
-        <id>adb_ue_2</id>
-    </testCase>
-
-    <testCase id="040671">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <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="040672">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <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="040673">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/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>
-        <direction>UL</direction>
-        <id>adb_ue_1</id>
-    </testCase>
-
-</testCaseList>
--- 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
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
 040101
 030102
 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201
-030202
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -64,7 +64,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
        <eNB_serverId>0</eNB_serverId>
    </testCase>

-    <testCase id="030202">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</yaml_path>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -34,7 +34,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 030111
 000001
 040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201
-030211
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -72,7 +72,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
    </testCase>

-    <testCase id="030211">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
--- 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
@@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 030112
 040301 040302 040512 040612 040650 040401
 040201
-030212
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -65,7 +65,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <eNB_serverId>0</eNB_serverId>
    </testCase>

-    <testCase id="030212">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 030121
 000001
 040301 040521 040623 040624 040625 040662 040401 040201
-030221
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -71,7 +71,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
    </testCase>

-    <testCase id="030221">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
 040101
 030104
 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201
-030204
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -79,7 +79,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
    </testCase>

-    <testCase id="030204">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1</yaml_path>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
@@ -1,205 +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-tdd-05-if4-5</htmlTabRef>
-    <htmlTabName>Test-TDD-05MHz-TM1-IF4.5</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-300000
-100000
-111110
-030134 030135
-040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201
-030231
-040101
-200000
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
-    </testCase>
-
-    <testCase id="100000">
-        <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>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-
-    <testCase id="300000">
-    <class>Custom_Command</class>
-    <desc>Reset USRP</desc>
-    <node>starsky</node>
-    <command>sudo -S b2xx_fx3_utils --reset-device</command>
-    </testCase>
-
-    <testCase id="030134">
-        <class>Deploy_Object</class>
-        <desc>Deploy RRU (TDD/Band40/5MHz/B200) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
-        <services>rru_tdd</services>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="030135">
-        <class>Deploy_Object</class>
-        <desc>Deploy RCC (TDD/Band40/5MHz) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
-        <services>rcc_tdd</services>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030231">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy RRU/RCC</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <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="040532">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20 %cn_ip%</ping_args>
-        <ping_packetloss_threshold>25</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="040631">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <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="040632">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <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="040634">
-        <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>
-        <direction>DL</direction>
-        <id>adb_ue_1</id>
-    </testCase>
-
-    <testCase id="040635">
-        <class>Iperf</class>
-        <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="040681">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <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="040682">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <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="040684">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <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="040685">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <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>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
 040101
 030105
 040301 040502 040606 040608 040646 040648 040401 040201
-030205
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -69,7 +69,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
    </testCase>

-    <testCase id="030205">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2</yaml_path>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
 040101
 030114
 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201
-030214
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -69,7 +69,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
    </testCase>

-    <testCase id="030214">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1</yaml_path>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
 040101
 030124
 040301 040521 040622 040621 040623 040662 040401 040201
-030224
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -69,7 +69,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
    </testCase>

-    <testCase id="030224">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1</yaml_path>
--- 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
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
 040101
 030125
 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201
-030225
+030201
 200000
    </TestCaseRequestedList>
    <TestCaseExclusionList></TestCaseExclusionList>
@@ -71,7 +71,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
    </testCase>

-    <testCase id="030225">
+    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</yaml_path>
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -41,12 +41,6 @@
    060002
    050000
    010010
-    010001
-    050001
-    010010
-    010001
-    050000
-    010010
    010002
    030201
    200000
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -37,12 +37,6 @@
    150000
    150001
    110011
-    110001
-    150001
-    110011
-    110001
-    150000
-    110011
    110002
    100001
    130201
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -1,187 +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-SA-FR1-SC-FDMA-B200</htmlTabRef>
-  <htmlTabName>40 MHz TDD SA with SC-FDMA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-    300000
-    311111
-    210000
-    230101
-    210001
-    250000
-    250001
-    270000
-    270001
-    270002
-    260001
-    200002
-    260002
-    250000
-    210010
-    210002
-    230201
-    400000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="311111">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <test_svr_id>0</test_svr_id>
-    <images_to_pull>oai-gnb</images_to_pull>
-  </testCase>
-
-  <testCase id="300000">
-    <class>Custom_Command</class>
-    <desc>Disable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="400000">
-    <class>Custom_Command</class>
-    <desc>Enable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -E</command>
-  </testCase>
-
-  <testCase id="210000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="210002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="210001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="210010">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-
-  <testCase id="230101">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/40MHz/B200) with SC-FDMA in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_sc_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="200001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="200002">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-  </testCase>
-
-
-  <testCase id="250000">
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>idefix</id>
-    <ping_args>-c 20 %cn_ip%</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="250001">
-    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>idefix</id>
-    <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="270000">
-    <class>Iperf</class>
-    <desc>iperf (DL/100Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 100M -t 30 -i 1 -fm</iperf_args>
-    <direction>DL</direction>
-    <id>idefix</id>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <iperf_profile>single-ue</iperf_profile>
-  </testCase>
-
-  <testCase id="270001">
-    <class>Iperf</class>
-    <desc>iperf (UL/6Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 6M -t 30 -i 1 -fm</iperf_args>
-    <direction>UL</direction>
-    <id>idefix</id>
-    <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <iperf_profile>single-ue</iperf_profile>
-  </testCase>
-
-  <testCase id="270002">
-    <class>Iperf</class>
-    <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
-    <iperf_args>-t 10 --bidir</iperf_args>
-    <direction>BIDIR</direction>
-    <id>idefix</id>
-    <iperf_profile>single-ue</iperf_profile>
-  </testCase>
-
-  <testCase id="260001">
-    <class>Custom_Command</class>
-    <desc>Trigger Reestablishment</desc>
-    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'force-remove UE RNTI [0-9a-f]{4} from RLC to trigger reestablishment'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-  <testCase id="260002">
-    <class>Custom_Command</class>
-    <desc>Verify Reestablishment</desc>
-    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1 reconf_after_reestab 1'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
-  <testCase id="230201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_sc_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <d_retx_th>10,100,100,100</d_retx_th>
-    <u_retx_th>10,100,100,100</u_retx_th>
-  </testCase>
-
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
@@ -1,41 +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-SA-FR1-B200-terminate</htmlTabRef>
-  <htmlTabName>Tear-down</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-  030201
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="030201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_sc_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml
+++ b/ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml
@@ -0,0 +1,104 @@
+<!--
+
+ 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</htmlTabRef>
+	<htmlTabName>Test-05MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201
+ 040101
+ 030104 030105 040301 040501 040602 040642 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030104">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (TDD/Band40)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf --RUs.[0].max_rxgain 125 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+	
+	<testCase id="030105">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (TDD/Band40/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+	
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RCC</desc>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RRU</desc>
+		<eNB_instance>0</eNB_instance>
+	</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>25</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040602">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<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>
+	</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_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml
+++ b/ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml
@@ -0,0 +1,107 @@
+<!--
+
+ 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-10</htmlTabRef>
+	<htmlTabName>Test-10MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestUnstable>True</TestUnstable>
+	<TestMinId>040612</TestMinId>
+	<TestCaseRequestedList>
+ 030201
+ 040101
+ 030114 030115 040301 040511 040612 040652 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030114">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (TDD/Band40)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+	
+	<testCase id="030115">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (TDD/Band40/10MHz/info)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RCC</desc>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RRU</desc>
+		<eNB_instance>0</eNB_instance>
+	</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="040511">
+		<class>Ping</class>
+		<desc>ping (10MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>25</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040612">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<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>
+	</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_packetloss_threshold>60</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml
+++ b/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml
@@ -0,0 +1,105 @@
+<!--
+
+ 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-20</htmlTabRef>
+	<htmlTabName>Test-20MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>
+ 030201
+ 040101
+ 030124 030125 040301 040521 040622 040662 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030124">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (TDD/Band40)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.tdd.band40.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030125">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (TDD/Band40/20MHz/info)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RCC</desc>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RRU</desc>
+		<eNB_instance>0</eNB_instance>
+	</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="040521">
+		<class>Ping</class>
+		<desc>ping (20MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>25</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040622">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<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>
+	</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_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml
@@ -0,0 +1,104 @@
+<!--
+
+ 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-if4p5-05</htmlTabRef>
+	<htmlTabName>Test-IF4.5-05MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201
+ 040101
+ 030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030101">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (FDD/Band7)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf --RUs.[0].max_rxgain 125 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030102">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RCC</desc>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RRU</desc>
+		<eNB_instance>1</eNB_instance>
+	</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="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="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>
+
+</testCaseList>
--- a/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
@@ -0,0 +1,104 @@
+<!--
+
+ 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-if4p5-10</htmlTabRef>
+	<htmlTabName>Test-IF4.5-10MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201
+ 040101
+ 030111 030112 040301 040511 040614 040652 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030111">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (FDD/Band7)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030112">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (FDD/Band7/10MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RCC</desc>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RRU</desc>
+		<eNB_instance>1</eNB_instance>
+	</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="040511">
+		<class>Ping</class>
+		<desc>ping (10MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040614">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 32M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040652">
+		<class>Iperf</class>
+		<desc>iperf (10MHz - UL/5Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 5M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
+++ b/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
@@ -0,0 +1,104 @@
+<!--
+
+ 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-if4p5-20</htmlTabRef>
+	<htmlTabName>Test-IF4.5-20MHz</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201
+ 040101
+ 030121 030122 040301 040521 040624 040662 040401 040201 030201 030202
+	</TestCaseRequestedList>
+	<TestCaseExclusionList>
+	</TestCaseExclusionList>
+
+	<testCase id="030121">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RRU (FDD/Band7)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rru.fdd.band7.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>1</eNB_instance>
+	</testCase>
+
+	<testCase id="030122">
+		<class>Initialize_eNB</class>
+		<desc>Initialize RCC (FDD/Band7/20MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RCC</desc>
+		<eNB_instance>0</eNB_instance>
+	</testCase>
+
+	<testCase id="030202">
+		<class>Terminate_eNB</class>
+		<desc>Terminate RRU</desc>
+		<eNB_instance>1</eNB_instance>
+	</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="040521">
+		<class>Ping</class>
+		<desc>ping (20MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040624">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/50Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 50M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040662">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/10Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 10M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml
@@ -7,10 +7,15 @@ services:
        container_name: lte-b200-rru-fdd-05Mhz-tm1
        network_mode: "host"
        environment:
-            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
+            - USE_B2XX='yes'
+            - USE_FDD_RRU=True
+            - RRU_IF4P5_IF_NAME=lo
+            - RCC_REMOTE_IP_ADDRESS=127.0.0.3
+            - RRU_LOCAL_IP_ADDRESS=127.0.0.2
+            - UTRA_BAND_ID=7
+            - THREAD_PARALLEL_CONFIG=PARALLEL_SINGLE_THREAD
+            - USE_ADDITIONAL_OPTIONS=--RUs.[0].max_rxgain 125 --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
-            - ../../conf_files/enb-rru.band7.usrpb210.tm1.conf:/opt/oai-enb/etc/enb.conf
            - /dev:/dev
        healthcheck:
            # pgrep does NOT work
@@ -24,9 +29,26 @@ services:
        container_name: lte-b200-rcc-fdd-05Mhz-tm1
        network_mode: "host"
        environment:
-            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
-        volumes:
-            - ../../conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf:/opt/oai-enb/etc/enb.conf
+            - USE_FDD_IF4P5_RCC=True
+            - ENB_NAME=rcc-in-docker
+            - MCC=208
+            - MNC=92
+            - MNC_LENGTH=2
+            - TAC=1
+            - UTRA_BAND_ID=7
+            - DL_FREQUENCY_IN_MHZ=2680
+            - UL_FREQUENCY_OFFSET_IN_MHZ=120
+            - NID_CELL=0
+            - NB_PRB=25
+            - MME_S1C_IP_ADDRESS=172.21.18.48
+            - RCC_IF_NAME=eno1
+            - RCC_S1C_IP_ADDRESS=172.21.18.46
+            - RCC_IP_ADDRESS=172.21.18.46
+            - IF4P5_IF_NAME=lo
+            - IF4P5_RRU_IP_ADDRESS=127.0.0.2
+            - IF4P5_RCC_IP_ADDRESS=127.0.0.3
+            - THREAD_PARALLEL_CONFIG=PARALLEL_SINGLE_THREAD
+            - USE_ADDITIONAL_OPTIONS=--log_config.global_log_options level,nocolor,time,line_num,function
        healthcheck:
            # pgrep does NOT work
            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
--- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml
@@ -1,35 +0,0 @@
-version: '3.8'
-
-services:
-    rru_tdd:
-        image: oai-enb:latest
-        privileged: true
-        container_name: lte-b200-rru-tdd-05Mhz-tm1
-        network_mode: "host"
-        environment:
-            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
-        volumes:
-            - ../../conf_files/enb-rru.band40.usrpb210.tm1.conf:/opt/oai-enb/etc/enb.conf
-            - /dev:/dev
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    rcc_tdd:
-        image: oai-enb:latest
-        privileged: true
-        container_name: lte-b200-rcc-tdd-05Mhz-tm1
-        network_mode: "host"
-        environment:
-            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function
-        volumes:
-            - ../../conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf:/opt/oai-enb/etc/enb.conf
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
--- a/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml
@@ -1,32 +0,0 @@
-version: '3.8'
-
-services:
-    gnb_mono_tdd:
-        image: oai-gnb:latest
-        privileged: true
-        container_name: sa-b200-gnb
-        environment:
-            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function -E
-        volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev:/dev
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.194
-        #entrypoint: /bin/bash -c "sleep infinity"
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-networks:
-    public_net:
-        name: sa-b200-gnb-net
-        ipam:
-            config:
-                - subnet: 192.168.68.192/26
-        driver_opts:
-            com.docker.network.bridge.name: "sa-gnb-net"
--- a/cmake_targets/babeld
+++ b/cmake_targets/babeld
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -280,7 +280,7 @@ function main() {
                    ;;
                "SIMU")
                    HW="OAI_"$2
-                    TARGET_LIST="$TARGET_LIST rfsimulator broker"
+                    TARGET_LIST="$TARGET_LIST rfsimulator"
                    CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"
                    ;;
                "AW2SORI")
@@ -315,7 +315,7 @@ function main() {
       -P | --phy_simulators)
            SIMUS_PHY=1
            # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
-            TARGET_LIST="$TARGET_LIST dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim"
+            TARGET_LIST="$TARGET_LIST dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim"
            echo_info "Will compile dlsim, ulsim, ..."
            shift;;
       -s | --check)
@@ -479,7 +479,7 @@ function main() {
    # add some default libraries that should always be built
    # for eNB, gNB, UEs, simulators
    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ]]; then
-      TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts broker"
+      TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts"
    fi

    mkdir -p $DIR/$BUILD_DIR/build
@@ -523,7 +523,7 @@ function main() {
    echo_info "Doxygen generation log is located here: $doxygen_log"
    echo_info "Generating Doxygen files....please wait"
    (
-      cmake3 --build . --target doc
+      cmake --build . --target doc
    ) >& $doxygen_log
  fi

--- a/cmake_targets/multi-ue.sh
+++ b/cmake_targets/multi-ue.sh
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-ue_id=-1
-
-create_namespace() {
-  ue_id=$1
-  local name="ue$ue_id"
-  echo "creating namespace for UE ID ${ue_id} name ${name}"
-  ip netns add $name
-  ip link add v-eth$ue_id type veth peer name v-ue$ue_id
-  ip link set v-ue$ue_id netns $name
-  BASE_IP=$((200+ue_id))
-  ip addr add 10.$BASE_IP.1.100/24 dev v-eth$ue_id
-  ip link set v-eth$ue_id up
-  iptables -t nat -A POSTROUTING -s 10.$BASE_IP.1.0/255.255.255.0 -o lo -j MASQUERADE
-  iptables -A FORWARD -i lo -o v-eth$ue_id -j ACCEPT
-  iptables -A FORWARD -o lo -i v-eth$ue_id -j ACCEPT
-  ip netns exec $name ip link set dev lo up
-  ip netns exec $name ip addr add 10.$BASE_IP.1.$ue_id/24 dev v-ue$ue_id
-  ip netns exec $name ip link set v-ue$ue_id up
-}
-
-delete_namespace() {
-  local ue_id=$1
-  local name="ue$ue_id"
-  echo "deleting namespace for UE ID ${ue_id} name ${name}"
-  ip link delete v-eth$ue_id
-  ip netns delete $name
-}
-
-list_namespaces() {
-  ip netns list
-}
-
-open_namespace() {
-  if [[ $ue_id -lt 1 ]]; then echo "error: no last UE processed"; exit 1; fi
-  local name="ue$ue_id"
-  echo "opening shell in namespace ${name}"
-  echo "type 'ip netns exec $name bash' in additional terminals"
-  ip netns exec $name bash
-}
-
-usage () {
-  echo "$1 -c <num>: create namespace \"ue<num>\""
-  echo "$1 -d <num>: delete namespace \"ue<num>\""
-  echo "$1 -e      : execute shell in last processed namespace"
-  echo "$1 -l      : list namespaces"
-  echo "$1 -o <num>: open shell in namespace \"ue<num>\""
-}
-
-prog_name=$(basename $0)
-
-if [[ $(id -u) -ne 0 ]] ; then echo "Please run as root"; exit 1; fi
-if [[ $# -eq 0 ]]; then echo "error: no parameters given"; usage $prog_name; exit 1; fi
-
-while getopts c:d:ehlo: cmd
-do
-  case "${cmd}" in
-    c) create_namespace ${OPTARG};;
-    d) delete_namespace ${OPTARG};;
-    e) open_namespace; exit;;
-    h) usage ${prog_name}; exit;;
-    l) list_namespaces;;
-    o) ue_id=${OPTARG}; open_namespace;;
-    /?) echo "Invalid option"; usage ${prog_name}; exit;;
-  esac
-done
--- a/cmake_targets/tools/MODULES/FindGcrypt.cmake
+++ b/cmake_targets/tools/MODULES/FindGcrypt.cmake
@@ -0,0 +1,36 @@
+# - Find gnutls
+# Find the native GCRYPT includes and library
+#
+#  GCRYPT_FOUND - True if gnutls found.
+#  GCRYPT_INCLUDE_DIR - where to find gnutls.h, etc.
+#  GCRYPT_LIBRARIES - List of libraries when using gnutls.
+
+if (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES)
+  set(GCRYPT_FIND_QUIETLY TRUE)
+endif (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES)
+
+# Include dir
+find_path(GCRYPT_INCLUDE_DIR
+	NAMES
+	  gcrypt.h
+)
+
+# Library
+find_library(GCRYPT_LIBRARY 
+  NAMES gcrypt
+)
+
+# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT DEFAULT_MSG GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR)
+
+IF(GCRYPT_FOUND)
+  SET( GCRYPT_LIBRARIES ${GCRYPT_LIBRARY} )
+ELSE(GCRYPT_FOUND)
+  SET( GCRYPT_LIBRARIES )
+ENDIF(GCRYPT_FOUND)
+
+# Lastly make it so that the GCRYPT_LIBRARY and GCRYPT_INCLUDE_DIR variables
+# only show up under the advanced options in the gui cmake applications.
+MARK_AS_ADVANCED( GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR )
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -554,24 +554,28 @@ check_install_additional_tools (){
            ;;
    esac
    PACKAGE_LIST="\
-        doxygen \
-        libgnutls28-dev \
-        libpthread-stubs0-dev \
-        libqt5charts5-dev \
-        tshark \
-        uml-utilities \
+	doxygen \
+	libpthread-stubs0-dev \
+	libqt5charts5-dev \
+	tshark \
+	uml-utilities \
        iperf3 \
        libforms-bin \
        libforms-dev \
-        libxft-dev \
        xmlstarlet"
-  elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]] ||  [[ "$OS_DISTRO" == "fedora" ]]; then
+  elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
    PACKAGE_LIST="\
      doxygen \
      ctags \
      iperf3 \
-      gnutls-devel \
-      libXft-devel \
+      xforms \
+      xforms-devel \
+      xmlstarlet"
+  elif [[ "$OS_DISTRO" == "fedora" ]]; then
+    PACKAGE_LIST=" \
+      doxygen \
+      ctags \
+      iperf3 \
      xforms \
      xforms-devel \
      xmlstarlet"
@@ -591,7 +595,7 @@ check_install_oai_software() {
    case "$(get_distribution_release)" in
        "ubuntu18.04")
            add_cmake_repo
-            specific_packages=""
+            specific_packages="libgcrypt11-dev"
            ;;
         "debian11")
            specific_packages="libz-dev"
@@ -610,10 +614,12 @@ check_install_oai_software() {
 	liblapack-dev \
 	liblapacke-dev \
 	libreadline-dev \
+	libgnutls28-dev \
 	libconfig-dev \
 	libsctp-dev  \
 	libssl-dev  \
 	libtool  \
+        libxft-dev \
 	patch \
 	openssl \
        zlib1g-dev \
@@ -639,15 +645,18 @@ check_install_oai_software() {
      pkgconfig \
      libconfig-devel \
      libffi-devel \
+      libgcrypt-devel \
      lksctp-tools \
      lksctp-tools-devel \
      libtool \
+      libXft-devel \
      ninja-build \
      make \
      openssl \
      openssl-devel \
      patch \
      readline-devel \
+      gnutls-devel \
      lapack \
      lapack-devel \
      blas \
--- a/common/platform_constants.h
+++ b/common/platform_constants.h
@@ -70,10 +70,7 @@
 #define NR_NB_RB_MAX (29 + 3) /* NR_maxDRB from NR_asn_constant.hm + 3 SRBs */

 #define NGAP_MAX_PDU_SESSION (256) /* As defined in TS 38.413 9.2.1.1 Range Bound for PDU Sessions. */
-
-#define MAX_DRBS_PER_UE         (32)  /* Maximum number of Data Radio Bearers per UE
-                                       * defined for NGAP in TS 38.413 - maxnoofDRBs */
-#define MAX_PDUS_PER_UE         (8)   /* Maximum number of PDU Sessions per UE */
+#define NGAP_MAX_DRBS_PER_UE (32) /* As defined in TS 38.413 9.2.1.1 - maxnoofDRBs */

 #define NB_RB_MBMS_MAX (29 * 16) /* 29 = LTE_maxSessionPerPMCH + 16 = LTE_maxServiceCount from LTE_asn_constant.h */

--- a/common/utils/LOG/log.c
+++ b/common/utils/LOG/log.c
@@ -487,7 +487,7 @@ int logInit (void)
  register_log_component("SCTP","",SCTP);
  register_log_component("X2AP","",X2AP);
  register_log_component("LOADER","log",LOADER);
-  register_log_component("ASN1","log",ASN1);
+  register_log_component("ASN","log",ASN);
  register_log_component("NFAPI_VNF","log",NFAPI_VNF);
  register_log_component("NFAPI_PNF","log",NFAPI_PNF);
  register_log_component("GNB_APP","log",GNB_APP);
--- a/common/utils/LOG/log.h
+++ b/common/utils/LOG/log.h
@@ -240,7 +240,7 @@ typedef enum {
  NR_MAC,
  NR_PHY,
  LOADER,
-  ASN1,
+  ASN,
  NFAPI_VNF,
  NFAPI_PNF,
  ITTI,
--- a/common/utils/T/tracer/CMakeLists.txt
+++ b/common/utils/T/tracer/CMakeLists.txt
@@ -21,6 +21,30 @@ target_link_libraries(extract_output_subframe PRIVATE tracer_utils)
 add_executable(extract extract.c)
 target_link_libraries(extract PRIVATE tracer_utils)

+add_executable(textlog textlog.c)
+target_link_libraries(textlog PRIVATE tracer_utils tracer_filter tracer_gui
+                      tracer_logger tracer_view tracer_events)
+
+
+find_library(png png REQUIRED)
+add_executable(enb enb.c)
+target_link_libraries(enb PRIVATE tracer_utils tracer_filter tracer_gui
+                      tracer_logger tracer_view tracer_events)
+target_link_libraries(enb PRIVATE png)
+
+add_executable(ue ue.c)
+target_link_libraries(ue PRIVATE tracer_utils tracer_filter tracer_gui
+                      tracer_logger tracer_view tracer_events)
+target_link_libraries(ue PRIVATE png)
+
+add_executable(vcd vcd.c)
+target_link_libraries(vcd PRIVATE tracer_utils tracer_filter tracer_gui
+                      tracer_logger tracer_view tracer_events)
+
+add_executable(to_vcd to_vcd.c)
+target_link_libraries(to_vcd PRIVATE tracer_utils tracer_filter tracer_gui
+                      tracer_logger tracer_view tracer_events)
+
 add_executable(macpdu2wireshark macpdu2wireshark.c)
 target_link_libraries(macpdu2wireshark PRIVATE tracer_utils)

@@ -28,52 +52,22 @@ add_executable(multi multi.c)
 target_link_libraries(multi PRIVATE tracer_utils T)
 target_include_directories(multi PRIVATE ..)

+add_executable(gnb gnb.c)
+target_link_libraries(gnb PRIVATE tracer_utils tracer_filter tracer_gui
+                      tracer_logger tracer_view tracer_events)
+target_link_libraries(gnb PRIVATE png)
+
+add_subdirectory(filter)
+add_subdirectory(gui)
+add_subdirectory(logger)
+add_subdirectory(view)
+
 add_custom_target(T_tools)
 add_dependencies(T_tools
-                 record replay extract_config extract_input_subframe
-                 extract_output_subframe extract macpdu2wireshark multi)
+                 record replay extract_config textlog enb ue vcd macpdu2wireshark
+                 extract_input_subframe extract_output_subframe to_vcd extract multi
+                 gnb)
 add_dependencies(nr-softmodem T_tools)
 add_dependencies(nr-uesoftmodem T_tools)
 add_dependencies(lte-softmodem T_tools)
 add_dependencies(lte-uesoftmodem T_tools)
-
-# Some T tracer tools need additional libraries (Xft, also PNG) that come with
-# a long list of dependencies. We put it behind a separate option for
-# GUI-related tools so they can be added on demand, if necessary.
-add_boolean_option(T_TRACER_GUI OFF  "Compile T tracer GUI tools" OFF)
-if(T_TRACER_GUI)
-  add_executable(textlog textlog.c)
-  target_link_libraries(textlog PRIVATE tracer_utils tracer_filter tracer_gui
-                        tracer_logger tracer_view tracer_events)
-
-  find_library(png png REQUIRED)
-  add_executable(enb enb.c)
-  target_link_libraries(enb PRIVATE tracer_utils tracer_filter tracer_gui
-                        tracer_logger tracer_view tracer_events)
-  target_link_libraries(enb PRIVATE png)
-
-  add_executable(gnb gnb.c)
-  target_link_libraries(gnb PRIVATE tracer_utils tracer_filter tracer_gui
-                        tracer_logger tracer_view tracer_events)
-  target_link_libraries(gnb PRIVATE png)
-
-  add_executable(ue ue.c)
-  target_link_libraries(ue PRIVATE tracer_utils tracer_filter tracer_gui
-                        tracer_logger tracer_view tracer_events)
-  target_link_libraries(ue PRIVATE png)
-
-  add_executable(vcd vcd.c)
-  target_link_libraries(vcd PRIVATE tracer_utils tracer_filter tracer_gui
-                        tracer_logger tracer_view tracer_events)
-
-  add_executable(to_vcd to_vcd.c)
-  target_link_libraries(to_vcd PRIVATE tracer_utils tracer_filter tracer_gui
-                        tracer_logger tracer_view tracer_events)
-
-  add_subdirectory(gui)
-  add_subdirectory(filter)
-  add_subdirectory(logger)
-  add_subdirectory(view)
-
-  add_dependencies(T_tools textlog enb gnb ue vcd to_vcd)
-endif()
--- a/common/utils/T/tracer/hacks/multi-rru-clean.c
+++ b/common/utils/T/tracer/hacks/multi-rru-clean.c
@@ -152,7 +152,7 @@ int main(int n, char **v)
    int32_t length;
    char *v;
    int vpos = 0;
-    struct timespec t = {0};
+    struct timespec t;
    char *buf;

    /* read event from file */
--- a/common/utils/T/tracer/to_vcd.c
+++ b/common/utils/T/tracer/to_vcd.c
@@ -345,9 +345,11 @@ int main(int n, char **v)
  /* setup traces */
  for (i = 0; i < nvars; i++) {
    char format[256];
-    int ret = snprintf(format, 256, "%c [%s] %s", vars[i].boolean ? 'b' : 'l', vars[i].arg, vars[i].vcd_name);
-    if (ret > 255)
-      abort();
+    if (strlen(vars[i].arg) + strlen(vars[i].vcd_name) > 256-16) abort();
+    sprintf(format, "%c [%s] %s",
+        vars[i].boolean ? 'b' : 'l',
+        vars[i].arg,
+        vars[i].vcd_name);
    textlog = new_textlog(h, database, vars[i].event, format);
    logger_add_view(textlog, vcd_view);
    on_off(database, vars[i].event, is_on, 1);
--- a/common/utils/colors.h
+++ b/common/utils/colors.h
@@ -1,8 +0,0 @@
-#define KNRM  "\x1B[0m"
-#define KRED  "\x1B[31m"
-#define KGRN  "\x1B[32m"
-#define KYEL  "\x1B[33m"
-#define KBLU  "\x1B[34m"
-#define KMAG  "\x1B[35m"
-#define KCYN  "\x1B[36m"
-#define KWHT  "\x1B[37m"
--- a/common/utils/config.h
+++ b/common/utils/config.h
@@ -27,28 +27,28 @@
 /*
 * This file "config.h" will be used by asn1c if HAVE_CONFIG_H_ is defined and
 * included. This logs asn1c encoder and decoder traces at execution time using
- * the regular OAI logging system, i.e., LOG_I(ASN1...);
+ * the regular OAI logging system, i.e., LOG_I(ASN...);
 *
 * As it is very verbose, note that you can change the log level per module in
 * source or in gdb, e.g., to only activate it for a short time.
 *
 * In code:
 * ```
- * set_log(ASN1, OAI_INFO); // enable logging
+ * set_log(ASN, OAI_INFO); // enable logging
 * // do your encoding here
- * set_log(ASN1, OAI_ERR);  // disable logging
+ * set_log(ASN, OAI_ERR);  // disable logging
 * ```
 *
 * in gdb:
 * ```
- * gdb> p set_log(ASN1, 1) // disable log, 1 == OAI_ERR
- * gdb> p set_log(ASN1, 5) // enable log,  5 == OAI_INFO
+ * gdb> p set_log(ASN, 1) // disable log, 1 == OAI_ERR
+ * gdb> p set_log(ASN, 5) // enable log,  5 == OAI_INFO
 * ```
 */

 #include "common/utils/LOG/log.h"
 #if DEBUG_ASN1C
-#define ASN_DEBUG(x...) do{ LOG_I(ASN1,x);LOG_I(ASN1,"\n"); } while(false)
+#define ASN_DEBUG(x...) do{ LOG_I(ASN,x);LOG_I(ASN,"\n"); } while(false)
 #else
 #define ASN_DEBUG(x...)
 #endif
--- a/common/utils/ds/byte_array.c
+++ b/common/utils/ds/byte_array.c
@@ -28,7 +28,7 @@ byte_array_t copy_byte_array(byte_array_t src)
 {
  byte_array_t dst = {0};
  dst.buf = malloc(src.len);
-  AssertFatal(dst.buf != NULL, "Memory exhausted");
+  DevAssert(dst.buf != NULL && "Memory exhausted");
  memcpy(dst.buf, src.buf, src.len);
  dst.len = src.len;
  return dst;
--- a/common/utils/nr/nr_common.c
+++ b/common/utils/nr/nr_common.c
@@ -33,8 +33,6 @@
 #include <stdint.h>
 #include "assertions.h"
 #include "nr_common.h"
-#include "executables/nr-uesoftmodem.h"
-#include "openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h"

 const char *duplex_mode[]={"FDD","TDD"};

@@ -234,45 +232,6 @@ int NRRIV2BW(int locationAndBandwidth,int N_RB) {

 }

-/* This function converts the FRIV to a start sub-channel and length in subchannels */
-/* for sl_MaxNumPerReserve = 2, the sequence from 38.214 for Lsc = 1,2,3, ... 
- * goes like startsc + (0,N_subch,N_subch +(N_subch-1), N_subch + (N_subch-1) + (N_subch-2), ...) 
- * 
- * This is only done for sl_MaxNumPerReserve = 2
- * */
-void convNRFRIV(int FRIV,
-                int N_subch,
-                long sl_MaxNumPerReserve,
-                uint16_t *Lsc,
-                uint16_t *startsc,
-                uint16_t *startsc2) {
-  if (sl_MaxNumPerReserve == NR_SL_UE_SelectedConfigRP_r16__sl_MaxNumPerReserve_r16_n2) {
-    *Lsc=1;
-    int prevN=0;
-    int N=N_subch;
-    while (FRIV>N) {
-      *Lsc = *Lsc+1;
-      prevN = N;
-      N += (N_subch - *Lsc + 1);
-    }
-    if (startsc) *startsc = FRIV-prevN;
-  } else if (sl_MaxNumPerReserve == NR_SL_UE_SelectedConfigRP_r16__sl_MaxNumPerReserve_r16_n3) {
-    *Lsc=1;
-    int prevN=0;
-    int N=N_subch;
-    while (FRIV>N) {
-      *Lsc = *Lsc + 1;
-      prevN = N;
-      N += ((N_subch - *Lsc + 1)*(N_subch - *Lsc + 1));
-    }
-    int tmp1 = FRIV - prevN; // This holds startsc1 + startsc2*(N_subch - *Lsc + 1)
-    if (startsc2) *startsc2 = tmp1 / (N_subch - *Lsc + 1);
-    if (startsc) *startsc = tmp1 % (N_subch - *Lsc + 1);
-  } else {
-    AssertFatal(1 == 0, "sl_MaxNumPerReserve is configured with incorrect value");
-  }
-}
-
 int NRRIV2PRBOFFSET(int locationAndBandwidth,int N_RB) {
  int tmp = locationAndBandwidth/N_RB;
  int tmp2 = locationAndBandwidth%N_RB;
@@ -392,7 +351,7 @@ int get_dmrs_port(int nl, uint16_t dmrs_ports)
      }
    }
  }
-  if (p==-1) LOG_E(NR_PHY,"No dmrs port corresponding to layer %d found\n",nl);
+  AssertFatal(p>-1,"No dmrs port corresponding to layer %d found\n",nl);
  return p;
 }

@@ -774,61 +733,3 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
  AssertFatal(sco % scs_scaling == 0, "ssb offset %d can create frequency offset\n", sco);
  return ssb_offset_point_a;
 }
-
-#define MAX_EL_213_9_3_2 19
-const float tab38_213_9_3_2[MAX_EL_213_9_3_2] = {1.125,1.250,1.375,1.625,1.750,2.000,2.250,2.500,2.875,3.125,3.500,4.000,5.000,6.250,8.000,10.000,12.625,15.875,20.000};
-
-int get_NREsci2(const int sci2_alpha,
-                const int sci2_payload_len,
-                const int sci2_beta_offset,
-                const int pssch_numsym,
-                const int pscch_numsym,
-                const int pscch_numrbs,
-                const int l_subch,
-                const int subchannel_size,
-                const int mcs,
-                const int mcs_tb_ind) {
-
-  float Osci2 = (float)sci2_payload_len;
-  AssertFatal(sci2_beta_offset < MAX_EL_213_9_3_2, "illegal sci2_beta_offset %d\n",sci2_beta_offset);
-  float beta_offset_sci2 = tab38_213_9_3_2[sci2_beta_offset];
-
-
-  uint32_t R10240 = nr_get_code_rate_ul(mcs,mcs_tb_ind);
-  uint32_t tmp  = (uint32_t)ceil((Osci2 + 24)*beta_offset_sci2/((float)R10240/5120));
-  float tmp2 = 12.0*pssch_numsym;
-  int N_REsci1  = 12*pscch_numrbs*pscch_numsym;
-  tmp2 *= l_subch*subchannel_size;
-  tmp2 -= N_REsci1;
-  tmp2 *= ((float)sci2_alpha/100.0);
-  int min_val = min(tmp,(int)ceil(tmp2));
-  uint8_t gamma = 12 - (min_val % 12);
-  return min_val + (gamma % 12);
-
-}
-int get_NREsci2_2(const int sci2_alpha,
-                  const int sci2_payload_len,
-                  const int sci2_beta_offset,
-                  const int pssch_numsym,
-                  const int pscch_numsym,
-                  const int pscch_numrbs,
-                  const int l_subch,
-                  const int subchannel_size,
-                  const int target_coderate,
-                  const int mcs_table_index) {
-
-  float Osci2 = (float)sci2_payload_len;
-  AssertFatal(sci2_beta_offset < MAX_EL_213_9_3_2, "illegal sci2_beta_offset %d\n",sci2_beta_offset);
-  float beta_offset_sci2 = tab38_213_9_3_2[sci2_beta_offset];
-
-  uint32_t R10240 = get_softmodem_params()->sl_mode ? nr_get_code_rate_ul(1, mcs_table_index) : target_coderate;
-  uint32_t tmp  = (uint32_t)ceil((Osci2 + 24)*beta_offset_sci2/((float)R10240/5120));
-  float tmp2 = 12.0*pssch_numsym;
-  int N_REsci1  = 12*pscch_numrbs*pscch_numsym;
-  tmp2 *= l_subch*subchannel_size;
-  tmp2 -= N_REsci1;
-  tmp2 *= ((float)sci2_alpha/100.0);
-  int min_val = min(tmp,(int)ceil(tmp2));
-  uint8_t gamma = 12 - (min_val % 12);
-  return min_val + (gamma % 12);
-}
--- a/common/utils/nr/nr_common.h
+++ b/common/utils/nr/nr_common.h
@@ -90,7 +90,6 @@ frame_type_t get_frame_type(uint16_t nr_bandP, uint8_t scs_index);
 uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex);
 int NRRIV2BW(int locationAndBandwidth,int N_RB);
 int NRRIV2PRBOFFSET(int locationAndBandwidth,int N_RB);
-void convNRFRIV(int FRIV, int N_subch, long sl_MaxNumPerReserve, uint16_t *Lsc, uint16_t *startsc, uint16_t *startsc2); 
 int PRBalloc_to_locationandbandwidth0(int NPRB,int RBstart,int BWPsize);
 int PRBalloc_to_locationandbandwidth(int NPRB,int RBstart);
 int get_subband_size(int NPRB,int size);
@@ -114,21 +113,7 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
                                  uint32_t absoluteFrequencyPointA,
                                  int ssbSubcarrierSpacing,
                                  int frequency_range);
-
-int get_NREsci2(const int sci2_alpha,
-                const int sci2_payload_len,
-                const int sci2_beta_offset,
-                const int pssch_numsym,
-                const int pscch_numsym,
-                const int pscch_numrbs,
-                const int l_subch,
-                const int subchannel_size,
-                const int mcs,
-                const int mcs_tb_ind);
-
 int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA);
-
-
 #define CEILIDIV(a,b) ((a+b-1)/b)
 #define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))

--- a/common/utils/system.c
+++ b/common/utils/system.c
@@ -231,9 +231,8 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
  int settingPriority = 1;
  ret=pthread_attr_init(&attr);
  AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
-  size_t stacksize;
-  pthread_attr_getstacksize(&attr,&stacksize);
-  LOG_I(UTIL,"Creating thread %s with affinity %d and priority %d, stacksize %d\n",name,affinity,priority,(int) stacksize);
+
+  LOG_I(UTIL,"Creating thread %s with affinity %d and priority %d\n",name,affinity,priority);

  if (checkIfFedoraDistribution())
    if (checkIfGenericKernelOnFedora())
--- a/doc/JSUC.md
+++ b/doc/JSUC.md
@@ -1,49 +0,0 @@
-# Joint sidelink and Uu communication (JSUC)
-This tutorial will discuss the setup for a hybrid communication mode using sidelink and Uu.
-
-## Setup
-The idea is to have 4 UEs, two running sidelink and two running normal mode. A logical UE (UE A and UE B) supporting hybrid communication mode is represented by 2 UEs, one running sidelink and the other running normal mode.
-
-![Hybrid Communication Setup Diagram](doc/images/hybrid_communication_setup.png)
-
-The following repos will be used for each technology:
- Uu: `mkdir normal-mode`, `cd normal-mode` then clone `https://github.com/beraoudabdelkhalek/rfsim-Uu-metrics`
- Sidelink: `mkdir sidelink`, `cd sidelink` then clone `https://gitlab.eurecom.fr/oai/openairinterface5g` and `git checkout sl-eurecom4`
-
- Build both projects, and build the telnet server for each project `./build_oai --build-lib telnetsrv`
- Run the OAI core network.
- Create 4 namespaces: `sudo ~/normal-mode/rfsim-Uu-metrics/tools/script/multi-ue.sh -c x` where x is from 1-4
- Run the gNB executable on the host using the project inside the `normal-mode` directory:
-```sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.options chanmod --telnetsrv```
- Run the broker on the host using the project inside `sidelink` directory.
- Run UE 1 in NS 1 (normal mode) using `normal-mode` directory:
-`sudo ~/normal-mode/rfsim-Uu-metrics/tools/script/multi-ue.sh -o 1`
-
-```sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --rfsimulator.serveraddr 10.201.1.100 --uicc0.imsi 001010000000001 -O ../../../ci-scripts/conf_files/nrue.uicc.conf --rfsimulator.options chanmod --telnetsrv --telnetsrv.listenport 9091```
-
- Run UE 2 in NS 2 (sidelink mode) using `sidelink` directory:
-`sudo ~/normal-mode/rfsim-Uu-metrics/tools/script/multi-ue.sh -o 2`
-
-```sudo RFSIMULATOR=server ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/sl_sync_ref.conf --sl-mode 2 --sa --sync-ref --brokerip 10.202.1.100```
-
- Run UE 3 in NS 3 (sidelink mode) using `sidelink` directory:
-`sudo ~/normal-mode/rfsim-Uu-metrics/tools/script/multi-ue.sh -o 3`
-
-```sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem --rfsim -O ../../../targets/PROJECTS/NR-SIDELINK/CONF/sl_ue1.conf --sl-mode 2 --sa --brokerip 10.203.1.100 --device_id 1```
-
- Run UE 4 in NS 4 (normal mode) using `normal-mode` directory:
-`sudo ~/normal-mode/rfsim-Uu-metrics/tools/script/multi-ue.sh -o 4`
-
-```sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --rfsimulator.serveraddr 10.204.1.100 --uicc0.imsi 001010000000002 -O ../../../ci-scripts/conf_files/nrue.uicc.conf --rfsimulator.options chanmod --telnetsrv --telnetsrv.listenport 9091```
-
-## Connectivity test
-
-### Uu Connectivity:
-From UE 1 ping UE 4:
- `sudo ~/normal-mode/rfsim-Uu-metrics/tools/script/multi-ue.sh -o 1`
- `ping 10.0.0.3`
-
-### Sidelink Connectivity:
-From UE 2 ping UE 3:
- `sudo ~/normal-mode/rfsim-Uu-metrics/tools/script/multi-ue.sh -o 2`
- `ping 10.0.0.2`
--- a/doc/images/hybrid_communication_setup.png
+++ b/doc/images/hybrid_communication_setup.png
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -112,28 +112,25 @@ time_stats_t softmodem_stats_rx_sf; // total rx time

 void tx_func(void *param) 
 {
+
  processingData_L1tx_t *info = (processingData_L1tx_t *) param;
-  PHY_VARS_gNB *gNB = info->gNB;
  int frame_tx = info->frame;
  int slot_tx = info->slot;
-  int cumul_samples = gNB->frame_parms.get_samples_per_slot(0, &gNB->frame_parms);
-  int i = 1;
-  for (; i < gNB->frame_parms.slots_per_subframe / 2; i++)
-    cumul_samples += gNB->frame_parms.get_samples_per_slot(i, &gNB->frame_parms);
-  int samples = cumul_samples / i;
-  int absslot_tx = info->timestamp_tx / samples;
-  int absslot_rx = absslot_tx - gNB->RU_list[0]->sl_ahead;
-  int rt_prof_idx = absslot_rx % RT_PROF_DEPTH;
-  start_meas(&gNB->phy_proc_tx);

-  clock_gettime(CLOCK_MONOTONIC, &gNB->rt_L1_profiling.start_L1_TX[rt_prof_idx]);
+  int absslot_tx = info->timestamp_tx/info->gNB->frame_parms.get_samples_per_slot(slot_tx,&info->gNB->frame_parms);
+  int absslot_rx = absslot_tx-info->gNB->RU_list[0]->sl_ahead;
+  int rt_prof_idx = absslot_rx % RT_PROF_DEPTH;
+  start_meas(&info->gNB->phy_proc_tx);
+
+  clock_gettime(CLOCK_MONOTONIC,&info->gNB->rt_L1_profiling.start_L1_TX[rt_prof_idx]);
  phy_procedures_gNB_TX(info,
                        frame_tx,
                        slot_tx,
                        1);
-  clock_gettime(CLOCK_MONOTONIC, &gNB->rt_L1_profiling.return_L1_TX[rt_prof_idx]);
+  clock_gettime(CLOCK_MONOTONIC,&info->gNB->rt_L1_profiling.return_L1_TX[rt_prof_idx]);

  if (get_softmodem_params()->reorder_thread_disable) {
+    PHY_VARS_gNB *gNB = info->gNB;
    processingData_RU_t syncMsgRU;
    syncMsgRU.frame_tx = frame_tx;
    syncMsgRU.slot_tx = slot_tx;
@@ -144,7 +141,7 @@ void tx_func(void *param)
  }
  /* this thread is done with the sched_info, decrease the reference counter */
  deref_sched_response(info->sched_response_id);
-  stop_meas(&gNB->phy_proc_tx);
+  stop_meas(&info->gNB->phy_proc_tx);
 }


@@ -182,14 +179,11 @@ void rx_func(void *param)
  int frame_tx = info->frame_tx;
  int slot_tx = info->slot_tx;
  nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
-  int cumul_samples = gNB->frame_parms.get_samples_per_slot(0, &gNB->frame_parms);
-  int i = 1;
-  for (; i < gNB->frame_parms.slots_per_subframe / 2; i++)
-    cumul_samples += gNB->frame_parms.get_samples_per_slot(i, &gNB->frame_parms);
-  int samples = cumul_samples / i;
-  int absslot_tx = info->timestamp_tx / samples;
+
+  int absslot_tx = info->timestamp_tx/gNB->frame_parms.get_samples_per_slot(slot_rx,&gNB->frame_parms);
  int absslot_rx = absslot_tx - gNB->RU_list[0]->sl_ahead;
  int rt_prof_idx = absslot_rx % RT_PROF_DEPTH;
+
  clock_gettime(CLOCK_MONOTONIC,&info->gNB->rt_L1_profiling.start_L1_RX[rt_prof_idx]);
  start_meas(&softmodem_stats_rxtx_sf);

--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -502,7 +502,7 @@ void fh_if5_north_asynch_in(RU_t *ru,int *frame,int *slot) {
  NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
  RU_proc_t *proc        = &ru->proc;
  int tti_tx,frame_tx;
-  openair0_timestamp timestamp_tx = 0;
+  openair0_timestamp timestamp_tx;
  AssertFatal(1==0,"Shouldn't get here\n");
  //      printf("Received subframe %d (TS %llu) from RCC\n",tti_tx,timestamp_tx);
  frame_tx    = (timestamp_tx / (fp->samples_per_subframe*10))&1023;
@@ -726,49 +726,6 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
  stop_meas(&ru->rx_fhaul);
 }

-static radio_tx_gpio_flag_t get_gpio_flags(RU_t *ru, int slot)
-{
-  radio_tx_gpio_flag_t flags_gpio = 0;
-  NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
-  openair0_config_t *cfg0 = &ru->openair0_cfg;
-
-  switch (cfg0->gpio_controller) {
-    case RU_GPIO_CONTROL_GENERIC:
-      // currently we switch beams at the beginning of a slot and we take the beam index of the first symbol of this slot
-      // we only send the beam to the gpio if the beam is different from the previous slot
-
-      if (ru->common.beam_id) {
-        int prev_slot = (slot - 1 + fp->slots_per_frame) % fp->slots_per_frame;
-        const uint8_t *beam_ids = ru->common.beam_id[0];
-        int prev_beam = beam_ids[prev_slot * fp->symbols_per_slot];
-        int beam = beam_ids[slot * fp->symbols_per_slot];
-        if (prev_beam != beam) {
-          flags_gpio = beam | TX_GPIO_CHANGE; // enable change of gpio
-          LOG_I(HW, "slot %d, beam %d\n", slot, ru->common.beam_id[0][slot * fp->symbols_per_slot]);
-        }
-      }
-      break;
-    case RU_GPIO_CONTROL_INTERDIGITAL: {
-      // the beam index is written in bits 8-10 of the flags
-      // bit 11 enables the gpio programming
-      int beam = 0;
-      if ((slot % 10 == 0) && ru->common.beam_id && (ru->common.beam_id[0][slot * fp->symbols_per_slot] < 64)) {
-        // beam = ru->common.beam_id[0][slot*fp->symbols_per_slot] | 64;
-        beam = 1024; // hardcoded now for beam32 boresight
-        // beam = 127; //for the sake of trying beam63
-        LOG_D(HW, "slot %d, beam %d\n", slot, beam);
-      }
-      flags_gpio = beam | TX_GPIO_CHANGE;
-      // flags_gpio |= beam << 8; // MSB 8 bits are used for beam
-      LOG_I(HW, "slot %d, beam %d, flags_gpio %d\n", slot, beam, flags_gpio);
-      break;
-    }
-    default:
-      AssertFatal(false, "illegal GPIO controller %d\n", cfg0->gpio_controller);
-  }
-
-  return flags_gpio;
-}

 void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
  RU_proc_t *proc = &ru->proc;
@@ -826,47 +783,47 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
    flags_burst = proc->first_tx == 1 ? TX_BURST_START : TX_BURST_MIDDLE;
  }

-  if (fp->freq_range == nr_FR2)
-    flags_gpio = get_gpio_flags(ru, slot);
+    if (fp->freq_range==nr_FR2) {
+      // currently we switch beams at the beginning of a slot and we take the beam index of the first symbol of this slot
+      // we only send the beam to the gpio if the beam is different from the previous slot

-  const int flags = flags_burst | (flags_gpio << 4);
+      if ( ru->common.beam_id) {
+        int prev_slot = (slot - 1 + fp->slots_per_frame) % fp->slots_per_frame;
+        const uint8_t *beam_ids = ru->common.beam_id[0];
+        int prev_beam = beam_ids[prev_slot * fp->symbols_per_slot];
+        int beam = beam_ids[slot * fp->symbols_per_slot];
+        if (prev_beam != beam) {
+          flags_gpio = beam | TX_GPIO_CHANGE; // enable change of gpio
+          LOG_D(HW, "slot %d, beam %d\n", slot, ru->common.beam_id[0][slot * fp->symbols_per_slot]);
+        }
+      }
+    }

-  if (proc->first_tx == 1)
-    proc->first_tx = 0;
+    const int flags = flags_burst | flags_gpio << 4;

-  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_TRX_WRITE_FLAGS, flags);
-  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_RU, frame);
-  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_TTI_NUMBER_TX0_RU, slot);
+    if (proc->first_tx == 1) proc->first_tx = 0;

-  for (i = 0; i < ru->nb_tx; i++)
-    txp[i] = (void *)&ru->common.txdata[i][fp->get_samples_slot_timestamp(slot, fp, 0)] - sf_extension * sizeof(int32_t);
+    VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_WRITE_FLAGS, flags );
+    VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_RU, frame );
+    VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TTI_NUMBER_TX0_RU, slot );

-  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST,
-                                          (timestamp + ru->ts_offset - ru->openair0_cfg.tx_sample_advance) & 0xffffffff);
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1);
-  // prepare tx buffer pointers
-  txs = ru->rfdevice.trx_write_func(&ru->rfdevice,
-                                    timestamp + 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 aa %d tx_rf, writing to TS %llu, %d.%d, unwrapped_frame %d, slot %d, flags %d, siglen+sf_extension %d, "
-        "returned %d, E %f\n",
-        ru->idx,
-        i,
-        (long long unsigned int)(timestamp + ru->ts_offset - ru->openair0_cfg.tx_sample_advance - sf_extension),
-        frame,
-        slot,
-        proc->frame_tx_unwrap,
-        slot,
-        flags,
-        siglen + sf_extension,
-        txs,
-        10 * log10((double)signal_energy(txp[0], siglen + sf_extension)));
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0);
-  // AssertFatal(txs == 0,"trx write function error %d\n", txs);
+    for (i=0; i<ru->nb_tx; i++)
+      txp[i] = (void *)&ru->common.txdata[i][fp->get_samples_slot_timestamp(slot,fp,0)]-sf_extension*sizeof(int32_t);
+    
+    VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, (timestamp+ru->ts_offset-ru->openair0_cfg.tx_sample_advance)&0xffffffff );
+    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 );
+      // prepare tx buffer pointers
+    txs = ru->rfdevice.trx_write_func(&ru->rfdevice,
+                                      timestamp+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 aa %d tx_rf, writing to TS %llu, %d.%d, unwrapped_frame %d, slot %d, flags %d, siglen+sf_extension %d, returned %d, E %f\n",ru->idx,i,
+	  (long long unsigned int)(timestamp+ru->ts_offset-ru->openair0_cfg.tx_sample_advance-sf_extension),frame,slot,proc->frame_tx_unwrap,slot, flags, siglen+sf_extension, txs,10*log10((double)signal_energy(txp[0],siglen+sf_extension)));
+    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
+      //AssertFatal(txs == 0,"trx write function error %d\n", txs);
+  
 }

 // this is for RU with local RF unit
@@ -1058,13 +1015,10 @@ void ru_tx_func(void *param) {
  int print_frame = 8;
  char filename[40];
 
-  int cumul_samples = fp->get_samples_per_slot(0, fp);
-  int i = 1;
-  for (; i < fp->slots_per_subframe / 2; i++)
-    cumul_samples += fp->get_samples_per_slot(i, fp);
-  int samples = cumul_samples / i;
-  int absslot_tx = info->timestamp_tx / samples;
-  int absslot_rx = absslot_tx - ru->sl_ahead;
+
+  // note that this will break for 60/120 kHz, to be handled
+  int absslot_tx = info->timestamp_tx/fp->get_samples_per_slot(slot_tx,fp);
+  int absslot_rx = absslot_tx-ru->sl_ahead;
  int rt_prof_idx = absslot_rx % RT_PROF_DEPTH;
  clock_gettime(CLOCK_MONOTONIC,&ru->rt_ru_profiling.start_RU_TX[rt_prof_idx]);
  // do TX front-end processing if needed (precoding and/or IDFTs)
@@ -1295,13 +1249,8 @@ void *ru_thread( void *param ) {
        clock_gettime(CLOCK_MONOTONIC,&ru->rt_ru_profiling.return_RU_feprx[rt_prof_idx]);
        //LOG_M("rxdata.m","rxs",ru->common.rxdata[0],1228800,1,1);
        LOG_D(PHY,"RU proc: frame_rx = %d, tti_rx = %d\n", proc->frame_rx, proc->tti_rx);
-        gNBscopeCopy(RC.gNB[0],
-                     gNBRxdataF,
-                     ru->common.rxdataF[0],
-                     sizeof(c16_t),
-                     1,
-                     gNB->frame_parms.samples_per_slot_wCP,
-                     proc->tti_rx * gNB->frame_parms.samples_per_slot_wCP);
+        if (IS_SOFTMODEM_DOSCOPE && RC.gNB[0]->scopeData)
+          ((scopeData_t *)RC.gNB[0]->scopeData)->slotFunc(ru->common.rxdataF[0],proc->tti_rx, RC.gNB[0]->scopeData);

        // Do PRACH RU processing
        int prach_id=find_nr_prach_ru(ru,proc->frame_rx,proc->tti_rx,SEARCH_EXIST);
@@ -1924,23 +1873,6 @@ static void NRRCconfig_RU(void)
        RC.ru[j]->openair0_cfg.sdr_addrs = strdup(*(RUParamList.paramarray[j][RU_SDR_ADDRS].strptr));
      }

-      if (config_isparamset(RUParamList.paramarray[j], RU_GPIO_CONTROL)) {
-        if (strcmp(*RUParamList.paramarray[j][RU_GPIO_CONTROL].strptr, "generic") == 0) {
-          RC.ru[j]->openair0_cfg.gpio_controller = RU_GPIO_CONTROL_GENERIC;
-          LOG_I(PHY, "RU GPIO control set as 'generic'\n");
-        } else if (strcmp(*RUParamList.paramarray[j][RU_GPIO_CONTROL].strptr, "interdigital") == 0) {
-          RC.ru[j]->openair0_cfg.gpio_controller = RU_GPIO_CONTROL_INTERDIGITAL;
-          LOG_I(PHY, "RU GPIO control set as 'interdigital'\n");
-        } else {
-          AssertFatal(false,
-                      "bad GPIO controller in configuration file: '%s'\n",
-                      *(RUParamList.paramarray[j][RU_GPIO_CONTROL].strptr));
-        }
-      } else {
-        RC.ru[j]->openair0_cfg.gpio_controller = RU_GPIO_CONTROL_GENERIC;
-        LOG_I(PHY, "RU GPIO control set as 'generic'\n");
-      }
-
      if (config_isparamset(RUParamList.paramarray[j], RU_TX_SUBDEV)) {
        RC.ru[j]->openair0_cfg.tx_subdev = strdup(*(RUParamList.paramarray[j][RU_TX_SUBDEV].strptr));
        LOG_I(PHY, "RU USRP tx subdev == %s\n", RC.ru[j]->openair0_cfg.tx_subdev);
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -169,7 +169,7 @@ extern void *udp_eNB_task(void *args_p);

 int transmission_mode=1;
 int emulate_rf = 0;
-int numerology = 1; //Jin change to 1
+int numerology = 0;


 static char *parallel_config = NULL;
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -99,8 +99,7 @@
 typedef enum {
  pss = 0,
  pbch = 1,
-  si = 2,
-  psbch = 3
+  si = 2
 } sync_mode_t;

 static void *NRUE_phy_stub_standalone_pnf_task(void *arg);
@@ -162,9 +161,6 @@ void init_nr_ue_vars(PHY_VARS_NR_UE *ue,
  // initialize all signal buffers
  init_nr_ue_signal(ue, nb_connected_gNB);

-  if (ue->sl_mode)
-    sl_ue_phy_init(ue);
-
  // intialize transport
  init_nr_ue_transport(ue);

@@ -309,16 +305,16 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
      nr_ue_dl_indication(&mac->dl_info);
      process_queued_nr_nfapi_msgs(mac, sfn_slot);
    }
-
-    bool only_dl = false;
-    if (mac->scc == NULL && mac->scc_SIB == NULL)
-      only_dl = true;
+    if (mac->scc == NULL && mac->scc_SIB == NULL) {
+      LOG_D(MAC, "[NSA] mac->scc == NULL and [SA] mac->scc_SIB == NULL!\n");
+      continue;
+    }

    int CC_id = 0;
    uint8_t gNB_id = 0;
    nr_uplink_indication_t ul_info;
    int slots_per_frame = 20; //30 kHZ subcarrier spacing
-    int slot_ahead = 3; // TODO: Make this dynamic
+    int slot_ahead = 2; // TODO: Make this dynamic
    ul_info.cc_id = CC_id;
    ul_info.gNB_index = gNB_id;
    ul_info.module_id = mod_id;
@@ -336,8 +332,7 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
      free_and_zero(ch_info);
    }

-    if (only_dl ||
-        is_nr_DL_slot(get_softmodem_params()->nsa ?
+    if (is_nr_DL_slot(get_softmodem_params()->nsa ?
                      mac->scc->tdd_UL_DL_ConfigurationCommon :
                      mac->scc_SIB->tdd_UL_DL_ConfigurationCommon,
                      ul_info.slot_rx)) {
@@ -354,8 +349,7 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)

    if (pthread_mutex_unlock(&mac->mutex_dl_info)) abort();

-    if (!only_dl &&
-        is_nr_UL_slot(get_softmodem_params()->nsa ?
+    if (is_nr_UL_slot(get_softmodem_params()->nsa ?
                      mac->scc->tdd_UL_DL_ConfigurationCommon :
                      mac->scc_SIB->tdd_UL_DL_ConfigurationCommon,
                      ul_info.slot_tx, mac->frame_type)) {
@@ -380,12 +374,11 @@ static void UE_synch(void *arg) {
  int i, hw_slot_offset;
  PHY_VARS_NR_UE *UE = syncD->UE;
  sync_mode_t sync_mode = pbch;
-  if (UE->sl_mode == 2 && !get_nrUE_params()->sync_ref)  sync_mode = psbch;
  //int CC_id = UE->CC_id;
  static int freq_offset=0;
  UE->is_synchronized = 0;

-  if (UE->UE_scan == 0 && !UE->sl_mode) {
+  if (UE->UE_scan == 0) {

    for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {

@@ -498,52 +491,6 @@ static void UE_synch(void *arg) {
      }
      break;

-    case psbch:
-      LOG_I(PHY, "[UE thread Synch] Running Sidelink Initial Synch \n");
-      NR_DL_FRAME_PARMS *fp = &UE->SL_UE_PHY_PARAMS.sl_frame_params;
-      dl_carrier = fp->sl_CarrierFreq;
-      ul_carrier = fp->sl_CarrierFreq;
-
-      if (sl_nr_slss_search(UE, &syncD->proc, 16) == 0) {
-        freq_offset = UE->common_vars.freq_offset; // frequency offset computed with pss in initial sync
-        hw_slot_offset = ((UE->rx_offset<<1) / fp->samples_per_subframe * fp->slots_per_subframe) +
-                         round((float)((UE->rx_offset<<1) % fp->samples_per_subframe)/fp->samples_per_slot0);
-
-        // rerun with new cell parameters and frequency-offset
-        // todo: the freq_offset computed on DL shall be scaled before being applied to UL
-        nr_rf_card_config_freq(&openair0_cfg[UE->rf_map.card], ul_carrier, dl_carrier, freq_offset);
-
-        LOG_I(PHY,"Got synch: hw_slot_offset %d, carrier off %d Hz, rxgain %f (DL %f Hz, UL %f Hz)\n",
-              hw_slot_offset,
-              freq_offset,
-              openair0_cfg[UE->rf_map.card].rx_gain[0],
-              openair0_cfg[UE->rf_map.card].rx_freq[0],
-              openair0_cfg[UE->rf_map.card].tx_freq[0]);
-
-        UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0]);
-        if (UE->UE_scan_carrier == 1) {
-          UE->UE_scan_carrier = 0;
-        } else {
-          UE->is_synchronized = 1;
-        }
-      } else {
-
-        if (UE->UE_scan_carrier == 1) {
-
-          if (freq_offset >= 0)
-            freq_offset += 100;
-
-          freq_offset *= -1;
-
-          nr_rf_card_config_freq(&openair0_cfg[UE->rf_map.card], ul_carrier, dl_carrier, freq_offset);
-
-          LOG_I(PHY, "Sidelink Initial sync failed: trying carrier off %d Hz\n", freq_offset);
-
-          UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0]);
-        }
-      }
-      break;
-
    case si:
    default:
      break;
@@ -551,54 +498,42 @@ static void UE_synch(void *arg) {
  }
 }

-static void RU_write(nr_rxtx_thread_data_t *rxtxD, int sl_tx_action) {
+static void RU_write(nr_rxtx_thread_data_t *rxtxD) {

  PHY_VARS_NR_UE *UE = rxtxD->UE;
  UE_nr_rxtx_proc_t *proc = &rxtxD->proc;

-  NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
-  if (UE->sl_mode == 2)
-    fp = &UE->SL_UE_PHY_PARAMS.sl_frame_params;
-
  void *txp[NB_ANTENNAS_TX];
-  for (int i=0; i<fp->nb_antennas_tx; i++)
-    txp[i] = (void *)&UE->common_vars.txData[i][fp->get_samples_slot_timestamp(proc->nr_slot_tx, fp, 0)];
+  for (int i=0; i<UE->frame_parms.nb_antennas_tx; i++)
+    txp[i] = (void *)&UE->common_vars.txData[i][UE->frame_parms.get_samples_slot_timestamp(proc->nr_slot_tx, &UE->frame_parms, 0)];

  radio_tx_burst_flag_t flags = TX_BURST_INVALID;

  NR_UE_MAC_INST_t *mac = get_mac_inst(0);
-  if (mac->phy_config_request_sent &&
-      openair0_cfg[0].duplex_mode == duplex_mode_TDD &&
-      !get_softmodem_params()->continuous_tx) {

-    //Perform USRP write only in case SL Txn needs to be done.
-    if (UE->sl_mode == 2) {
-      flags = sl_tx_action ? TX_BURST_START_AND_END
-                           : TX_BURST_INVALID;
-    } else {
+  if (openair0_cfg[0].duplex_mode == duplex_mode_TDD && !get_softmodem_params()->continuous_tx) {

-      uint8_t tdd_period = mac->phy_config.config_req.tdd_table.tdd_period_in_slots;
-      int nrofUplinkSlots, nrofUplinkSymbols;
-      if (mac->scc) {
-        nrofUplinkSlots = mac->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
-        nrofUplinkSymbols = mac->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols;
-      }
-      else {
-        nrofUplinkSlots = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
-        nrofUplinkSymbols = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols;
-      }
-
-      int slot_tx_usrp = proc->nr_slot_tx;
-      uint8_t  num_UL_slots = nrofUplinkSlots + (nrofUplinkSymbols != 0);
-      uint8_t first_tx_slot = tdd_period - num_UL_slots;
-
-      if (slot_tx_usrp % tdd_period == first_tx_slot)
-        flags = TX_BURST_START;
-      else if (slot_tx_usrp % tdd_period == first_tx_slot + num_UL_slots - 1)
-        flags = TX_BURST_END;
-      else if (slot_tx_usrp % tdd_period > first_tx_slot)
-        flags = TX_BURST_MIDDLE;
+    uint8_t tdd_period = mac->phy_config.config_req.tdd_table.tdd_period_in_slots;
+    int nrofUplinkSlots, nrofUplinkSymbols;
+    if (mac->scc) {
+      nrofUplinkSlots = mac->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
+      nrofUplinkSymbols = mac->scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols;
    }
+    else {
+      nrofUplinkSlots = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots;
+      nrofUplinkSymbols = mac->scc_SIB->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSymbols;
+    }
+
+    int slot_tx_usrp = proc->nr_slot_tx;
+    uint8_t  num_UL_slots = nrofUplinkSlots + (nrofUplinkSymbols != 0);
+    uint8_t first_tx_slot = tdd_period - num_UL_slots;
+
+    if (slot_tx_usrp % tdd_period == first_tx_slot)
+      flags = TX_BURST_START;
+    else if (slot_tx_usrp % tdd_period == first_tx_slot + num_UL_slots - 1)
+      flags = TX_BURST_END;
+    else if (slot_tx_usrp % tdd_period > first_tx_slot)
+      flags = TX_BURST_MIDDLE;
  } else {
    flags = TX_BURST_MIDDLE;
  }
@@ -609,10 +544,10 @@ static void RU_write(nr_rxtx_thread_data_t *rxtxD, int sl_tx_action) {
                                            proc->timestamp_tx,
                                            txp,
                                            rxtxD->writeBlockSize,
-                                            fp->nb_antennas_tx,
+                                            UE->frame_parms.nb_antennas_tx,
                                            flags),"");

-  for (int i=0; i<fp->nb_antennas_tx; i++)
+  for (int i=0; i<UE->frame_parms.nb_antennas_tx; i++)
    memset(txp[i], 0, rxtxD->writeBlockSize);

 }
@@ -623,77 +558,45 @@ void processSlotTX(void *arg) {
  UE_nr_rxtx_proc_t *proc = &rxtxD->proc;
  PHY_VARS_NR_UE    *UE   = rxtxD->UE;
  nr_phy_data_tx_t phy_data = {0};
-  int sl_tx_action = 0;

+  LOG_D(PHY,"%d.%d => slot type %d\n", proc->frame_tx, proc->nr_slot_tx, proc->tx_slot_type);
+  if (proc->tx_slot_type == NR_UPLINK_SLOT || proc->tx_slot_type == NR_MIXED_SLOT){

-  if (proc->tx_slot_type == NR_SIDELINK_SLOT && UE->sl_mode == 2) {
+    // wait for rx slots to send indication (if any) that DLSCH decoding is finished
+    for(int i=0; i < rxtxD->tx_wait_for_dlsch; i++) {
+      notifiedFIFO_elt_t *res = pullNotifiedFIFO(UE->tx_resume_ind_fifo[proc->nr_slot_tx]);
+      delNotifiedFIFO_elt(res);
+    }

-   // trigger L2 to run ue_scheduler thru IF module
-    if(UE->if_inst != NULL && UE->if_inst->sl_indication != NULL) {
+    // trigger L2 to run ue_scheduler thru IF module
+    // [TODO] mapping right after NR initial sync
+    if(UE->if_inst != NULL && UE->if_inst->ul_indication != NULL) {
      start_meas(&UE->ue_ul_indication_stats);
-      nr_sidelink_indication_t sl_indication;
-      memset((void*)&sl_indication, 0, sizeof(sl_indication));
+      nr_uplink_indication_t ul_indication;
+      memset((void*)&ul_indication, 0, sizeof(ul_indication));

-      sl_indication.module_id = UE->Mod_id;
-      sl_indication.gNB_index = proc->gNB_id;
-      sl_indication.cc_id     = UE->CC_id;
-      sl_indication.frame_rx  = proc->frame_rx;
-      sl_indication.slot_rx   = proc->nr_slot_rx;
-      sl_indication.frame_tx  = proc->frame_tx;
-      sl_indication.slot_tx   = proc->nr_slot_tx;
-      sl_indication.phy_data  = &phy_data;
-      sl_indication.slot_type = SIDELINK_SLOT_TYPE_TX;
-
-      LOG_D(NR_PHY,"Sending SL indication RX %d.%d TX %d.%d\n",proc->frame_rx,proc->nr_slot_rx,proc->frame_tx,proc->nr_slot_tx);
-      UE->if_inst->sl_indication(&sl_indication);
+      ul_indication.module_id = UE->Mod_id;
+      ul_indication.gNB_index = proc->gNB_id;
+      ul_indication.cc_id     = UE->CC_id;
+      ul_indication.frame_rx  = proc->frame_rx;
+      ul_indication.slot_rx   = proc->nr_slot_rx;
+      ul_indication.frame_tx  = proc->frame_tx;
+      ul_indication.slot_tx   = proc->nr_slot_tx;
+      ul_indication.phy_data      = &phy_data;

+      UE->if_inst->ul_indication(&ul_indication);
      stop_meas(&UE->ue_ul_indication_stats);
    }

-    sl_tx_action = phy_procedures_nrUE_SL_TX(UE, proc, &phy_data);
-
-  } else {
-    if (proc->tx_slot_type == NR_UPLINK_SLOT || proc->tx_slot_type == NR_MIXED_SLOT){
-
-      // wait for rx slots to send indication (if any) that DLSCH decoding is finished
-      for(int i=0; i < rxtxD->tx_wait_for_dlsch; i++) {
-        notifiedFIFO_elt_t *res = pullNotifiedFIFO(UE->tx_resume_ind_fifo[proc->nr_slot_tx]);
-        delNotifiedFIFO_elt(res);
-      }
-
-      // trigger L2 to run ue_scheduler thru IF module
-      // [TODO] mapping right after NR initial sync
-      if(UE->if_inst != NULL && UE->if_inst->ul_indication != NULL) {
-        start_meas(&UE->ue_ul_indication_stats);
-        nr_uplink_indication_t ul_indication;
-        memset((void*)&ul_indication, 0, sizeof(ul_indication));
-
-        ul_indication.module_id = UE->Mod_id;
-        ul_indication.gNB_index = proc->gNB_id;
-        ul_indication.cc_id     = UE->CC_id;
-        ul_indication.frame_rx  = proc->frame_rx;
-        ul_indication.slot_rx   = proc->nr_slot_rx;
-        ul_indication.frame_tx  = proc->frame_tx;
-        ul_indication.slot_tx   = proc->nr_slot_tx;
-        ul_indication.phy_data      = &phy_data;
-
-        UE->if_inst->ul_indication(&ul_indication);
-        stop_meas(&UE->ue_ul_indication_stats);
-      }
-
-      phy_procedures_nrUE_TX(UE, proc, &phy_data);
-    }
+    phy_procedures_nrUE_TX(UE, proc, &phy_data);
  }

-  RU_write(rxtxD, sl_tx_action);
+  RU_write(rxtxD);
 }

-nr_phy_data_t UE_dl_preprocessing(PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc)
-{
+nr_phy_data_t UE_dl_preprocessing(PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
+
  nr_phy_data_t phy_data = {0};
-  NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
-  if (UE->sl_mode == 2)
-    fp = &UE->SL_UE_PHY_PARAMS.sl_frame_params;

  if (IS_SOFTMODEM_NOS1 || get_softmodem_params()->sa) {

@@ -708,48 +611,34 @@ nr_phy_data_t UE_dl_preprocessing(PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc)
    }

    /* send tick to RLC and PDCP every ms */
-    if (proc->nr_slot_rx % fp->slots_per_subframe == 0) {
+    if (proc->nr_slot_rx % UE->frame_parms.slots_per_subframe == 0) {
      void nr_rlc_tick(int frame, int subframe);
      void nr_pdcp_tick(int frame, int subframe);
-      nr_rlc_tick(proc->frame_rx, proc->nr_slot_rx / fp->slots_per_subframe);
-      nr_pdcp_tick(proc->frame_rx, proc->nr_slot_rx / fp->slots_per_subframe);
+      nr_rlc_tick(proc->frame_rx, proc->nr_slot_rx / UE->frame_parms.slots_per_subframe);
+      nr_pdcp_tick(proc->frame_rx, proc->nr_slot_rx / UE->frame_parms.slots_per_subframe);
    }
  }

-  if (UE->sl_mode == 2) {
-    if (proc->rx_slot_type == NR_SIDELINK_SLOT) {
+  if (proc->rx_slot_type == NR_DOWNLINK_SLOT || proc->rx_slot_type == NR_MIXED_SLOT){

-      if(UE->if_inst != NULL && UE->if_inst->sl_indication != NULL) {
-        nr_sidelink_indication_t sl_indication;
-        nr_fill_sl_indication(&sl_indication, NULL, NULL, proc, UE, &phy_data);
-        UE->if_inst->sl_indication(&sl_indication);
-      }
-      uint64_t a=rdtsc_oai();
-      psbch_pscch_pssch_processing(UE, proc, &phy_data);
-      LOG_D(PHY, "In %s: slot %d:%d, time %llu\n", __FUNCTION__, proc->frame_rx, proc->nr_slot_rx, (rdtsc_oai()-a)/3500);
-    }
-  } else {
-    if (proc->rx_slot_type == NR_DOWNLINK_SLOT || proc->rx_slot_type == NR_MIXED_SLOT){
-
-      if(UE->if_inst != NULL && UE->if_inst->dl_indication != NULL) {
-        nr_downlink_indication_t dl_indication;
-        nr_fill_dl_indication(&dl_indication, NULL, NULL, proc, UE, &phy_data);
-        UE->if_inst->dl_indication(&dl_indication);
-      }
-
-      uint64_t a=rdtsc_oai();
-      pbch_pdcch_processing(UE, proc, &phy_data);
-      if (phy_data.dlsch[0].active) {
-        // indicate to tx thread to wait for DLSCH decoding
-        const int ack_nack_slot = (proc->nr_slot_rx + phy_data.dlsch[0].dlsch_config.k1_feedback) % UE->frame_parms.slots_per_frame;
-        UE->tx_wait_for_dlsch[ack_nack_slot]++;
-      }
-
-      LOG_D(PHY, "In %s: slot %d, time %llu\n", __FUNCTION__, proc->nr_slot_rx, (rdtsc_oai()-a)/3500);
+    if(UE->if_inst != NULL && UE->if_inst->dl_indication != NULL) {
+      nr_downlink_indication_t dl_indication;
+      nr_fill_dl_indication(&dl_indication, NULL, NULL, proc, UE, &phy_data);
+      UE->if_inst->dl_indication(&dl_indication);
    }

-    ue_ta_procedures(UE, proc->nr_slot_tx, proc->frame_tx);
+    uint64_t a=rdtsc_oai();
+    pbch_pdcch_processing(UE, proc, &phy_data);
+    if (phy_data.dlsch[0].active) {
+      // indicate to tx thread to wait for DLSCH decoding
+      const int ack_nack_slot = (proc->nr_slot_rx + phy_data.dlsch[0].dlsch_config.k1_feedback) % UE->frame_parms.slots_per_frame;
+      UE->tx_wait_for_dlsch[ack_nack_slot]++;
+    }
+
+    LOG_D(PHY, "In %s: slot %d, time %llu\n", __FUNCTION__, proc->nr_slot_rx, (rdtsc_oai()-a)/3500);
  }
+
+  ue_ta_procedures(UE, proc->nr_slot_tx, proc->frame_tx);
  return phy_data;
 }

@@ -759,20 +648,14 @@ void UE_dl_processing(void *arg) {
  PHY_VARS_NR_UE    *UE   = rxtxD->UE;
  nr_phy_data_t *phy_data = &rxtxD->phy_data;

-  if (UE->sl_mode == 0)
-    pdsch_processing(UE, proc, phy_data);
+  pdsch_processing(UE, proc, phy_data);
 }

 void dummyWrite(PHY_VARS_NR_UE *UE,openair0_timestamp timestamp, int writeBlockSize) {
-
-  NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
-  if (UE->sl_mode == 2)
-    fp = &UE->SL_UE_PHY_PARAMS.sl_frame_params;
-
-  void *dummy_tx[fp->nb_antennas_tx];
-  int16_t dummy_tx_data[fp->nb_antennas_tx][2*writeBlockSize]; // 2 because the function we call use pairs of int16_t implicitly as complex numbers
+  void *dummy_tx[UE->frame_parms.nb_antennas_tx];
+  int16_t dummy_tx_data[UE->frame_parms.nb_antennas_tx][2*writeBlockSize]; // 2 because the function we call use pairs of int16_t implicitly as complex numbers
  memset(dummy_tx_data, 0, sizeof(dummy_tx_data));
-  for (int i=0; i<fp->nb_antennas_tx; i++)
+  for (int i=0; i<UE->frame_parms.nb_antennas_tx; i++)
    dummy_tx[i]=dummy_tx_data[i];

  AssertFatal( writeBlockSize ==
@@ -780,45 +663,37 @@ void dummyWrite(PHY_VARS_NR_UE *UE,openair0_timestamp timestamp, int writeBlockS
               timestamp,
               dummy_tx,
               writeBlockSize,
-               fp->nb_antennas_tx,
+               UE->frame_parms.nb_antennas_tx,
               4),"");

 }

 void readFrame(PHY_VARS_NR_UE *UE,  openair0_timestamp *timestamp, bool toTrash) {

-  NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
-  int num_frames = 2;
-  //In Sidelink worst case SL-SSB can be sent once in 16 frames
-  if (UE->sl_mode == 2) {
-    fp = &UE->SL_UE_PHY_PARAMS.sl_frame_params;
-    num_frames = SL_NR_PSBCH_REPETITION_IN_FRAMES;
-  }
-
  void *rxp[NB_ANTENNAS_RX];

-  for(int x=0; x< num_frames*NR_NUMBER_OF_SUBFRAMES_PER_FRAME; x++) {  // two frames for initial sync
-    for (int slot=0; slot<fp->slots_per_subframe; slot ++ ) {
-      for (int i=0; i<fp->nb_antennas_rx; i++) {
+  for(int x=0; x<20; x++) {  // two frames for initial sync
+    for (int slot=0; slot<UE->frame_parms.slots_per_subframe; slot ++ ) {
+      for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++) {
        if (toTrash)
-          rxp[i]=malloc16(fp->get_samples_per_slot(slot,fp)*4);
+          rxp[i]=malloc16(UE->frame_parms.get_samples_per_slot(slot,&UE->frame_parms)*4);
        else
          rxp[i] = ((void *)&UE->common_vars.rxdata[i][0]) +
-                   4*((x*fp->samples_per_subframe)+
-                   fp->get_samples_slot_timestamp(slot,fp,0));
+                   4*((x*UE->frame_parms.samples_per_subframe)+
+                   UE->frame_parms.get_samples_slot_timestamp(slot,&UE->frame_parms,0));
      }
-
-      AssertFatal( fp->get_samples_per_slot(slot,fp) ==
+        
+      AssertFatal( UE->frame_parms.get_samples_per_slot(slot,&UE->frame_parms) ==
                   UE->rfdevice.trx_read_func(&UE->rfdevice,
                   timestamp,
                   rxp,
-                   fp->get_samples_per_slot(slot,fp),
-                   fp->nb_antennas_rx), "");
+                   UE->frame_parms.get_samples_per_slot(slot,&UE->frame_parms),
+                   UE->frame_parms.nb_antennas_rx), "");

      if (IS_SOFTMODEM_RFSIM)
-        dummyWrite(UE,*timestamp, fp->get_samples_per_slot(slot,fp));
+        dummyWrite(UE,*timestamp, UE->frame_parms.get_samples_per_slot(slot,&UE->frame_parms));
      if (toTrash)
-        for (int i=0; i<fp->nb_antennas_rx; i++)
+        for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
          free(rxp[i]);
    }
  }
@@ -829,25 +704,21 @@ void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {

    LOG_I(PHY,"Resynchronizing RX by %d samples\n",UE->rx_offset);

-    NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
-    if (UE->sl_mode == 2)
-      fp = &UE->SL_UE_PHY_PARAMS.sl_frame_params;
-
    if (IS_SOFTMODEM_IQPLAYER || IS_SOFTMODEM_IQRECORDER) {
      // Resynchonize by slot (will work with numerology 1 only)
-      for ( int size=UE->rx_offset ; size > 0 ; size -= fp->samples_per_subframe/2 ) {
-	int unitTransfer=size>fp->samples_per_subframe/2 ? fp->samples_per_subframe/2 : size ;
+      for ( int size=UE->rx_offset ; size > 0 ; size -= UE->frame_parms.samples_per_subframe/2 ) {
+	int unitTransfer=size>UE->frame_parms.samples_per_subframe/2 ? UE->frame_parms.samples_per_subframe/2 : size ;
 	AssertFatal(unitTransfer ==
 		    UE->rfdevice.trx_read_func(&UE->rfdevice,
 					       timestamp,
 					       (void **)UE->common_vars.rxdata,
 					       unitTransfer,
-					       fp->nb_antennas_rx),"");
+					       UE->frame_parms.nb_antennas_rx),"");
      }
    } else {
-      *timestamp += fp->get_samples_per_slot(1,fp);
-      for ( int size=UE->rx_offset ; size > 0 ; size -= fp->samples_per_subframe ) {
-	int unitTransfer=size>fp->samples_per_subframe ? fp->samples_per_subframe : size ;
+      *timestamp += UE->frame_parms.get_samples_per_slot(1,&UE->frame_parms);
+      for ( int size=UE->rx_offset ; size > 0 ; size -= UE->frame_parms.samples_per_subframe ) {
+	int unitTransfer=size>UE->frame_parms.samples_per_subframe ? UE->frame_parms.samples_per_subframe : size ;
 	// we write before read because gNB waits for UE to write and both executions halt
 	// this happens here as the read size is samples_per_subframe which is very much larger than samp_per_slot
 	if (IS_SOFTMODEM_RFSIM) dummyWrite(UE,*timestamp, unitTransfer);
@@ -856,7 +727,7 @@ void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
 					       timestamp,
 					       (void **)UE->common_vars.rxdata,
 					       unitTransfer,
-					       fp->nb_antennas_rx),"");
+					       UE->frame_parms.nb_antennas_rx),"");
 	*timestamp += unitTransfer; // this does not affect the read but needed for RFSIM write
      }
    }
@@ -878,8 +749,7 @@ static inline int get_readBlockSize(uint16_t slot, NR_DL_FRAME_PARMS *fp) {
  return rem_samples + next_slot_first_symbol;
 }

-void *UE_thread(void *arg)
-{
+void *UE_thread(void *arg) {
  //this thread should be over the processing thread to keep in real time
  PHY_VARS_NR_UE *UE = (PHY_VARS_NR_UE *) arg;
  //  int tx_enabled = 0;
@@ -887,12 +757,6 @@ void *UE_thread(void *arg)
  void *rxp[NB_ANTENNAS_RX];
  int start_rx_stream = 0;
  fapi_nr_config_request_t *cfg = &UE->nrUE_config;
-  NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
-  int is_sidelink = (UE->sl_mode == 2) ? 1 : 0;
-  if (is_sidelink) {
-    fp = &UE->SL_UE_PHY_PARAMS.sl_frame_params;
-    openair0_cfg[0].gpio_controller = RU_GPIO_CONTROL_GENERIC;
-  }
  AssertFatal(0== openair0_device_load(&(UE->rfdevice), &openair0_cfg[0]), "");
  UE->rfdevice.host_type = RAU_HOST;
  UE->is_synchronized = 0;
@@ -911,7 +775,7 @@ void *UE_thread(void *arg)
  NR_UE_MAC_INST_t *mac = get_mac_inst(0);

  bool syncRunning=false;
-  const int nb_slot_frame = fp->slots_per_frame;
+  const int nb_slot_frame = UE->frame_parms.slots_per_frame;
  int absolute_slot=0, decoded_frame_rx=INT_MAX, trashed_frames=0;
  initNotifiedFIFO(&UE->phy_config_ind);

@@ -922,12 +786,6 @@ void *UE_thread(void *arg)
    initNotifiedFIFO(UE->tx_resume_ind_fifo[i]);
  }

-  if (get_nrUE_params()->sync_ref &&
-      UE->sl_mode == 2) {
-      UE->is_synchronized = 1;
-      start_rx_stream = -1;
-  }
-
  while (!oai_exit) {

    if (syncRunning) {
@@ -935,15 +793,21 @@ void *UE_thread(void *arg)

      if (res) {
        syncRunning=false;
+        syncData_t *tmp=(syncData_t *)NotifiedFifoData(res);
        if (UE->is_synchronized) {
-          if (UE->sl_mode == 2) decoded_frame_rx = UE->SL_UE_PHY_PARAMS.sync_params.DFN;
-          else decoded_frame_rx = mac->mib_frame;
-          LOG_I(PHY,"UE synchronized decoded_frame_rx=%d UE->init_sync_frame=%d trashed_frames=%d\n",
-                decoded_frame_rx,
-                UE->init_sync_frame,
-                trashed_frames);
+	  LOG_I(PHY,"UE synchronized decoded_frame_rx=%d UE->init_sync_frame=%d trashed_frames=%d\n",
+		decoded_frame_rx,
+		UE->init_sync_frame,
+		trashed_frames);
+
+          decoded_frame_rx=(((mac->mib->systemFrameNumber.buf[0] >> mac->mib->systemFrameNumber.bits_unused)<<4) | tmp->proc.decoded_frame_rx);
          // shift the frame index with all the frames we trashed meanwhile we perform the synch search
-          decoded_frame_rx = (decoded_frame_rx + UE->init_sync_frame + trashed_frames) % MAX_FRAME_NUMBER;
+          decoded_frame_rx=(decoded_frame_rx + UE->init_sync_frame + trashed_frames) % MAX_FRAME_NUMBER;
+          // wait for RRC to configure PHY parameters from SIB
+          if (get_softmodem_params()->sa) {
+            notifiedFIFO_elt_t *phy_config_res = pullNotifiedFIFO(&UE->phy_config_ind);
+            delNotifiedFIFO_elt(phy_config_res);
+          }
        }
        delNotifiedFIFO_elt(res);
        start_rx_stream=0;
@@ -956,7 +820,7 @@ void *UE_thread(void *arg)
 	  }
 	} else {
 	  readFrame(UE, &timestamp, true);
-	  trashed_frames+=((UE->sl_mode)?SL_NR_PSBCH_REPETITION_IN_FRAMES:2);
+	  trashed_frames+=2;
 	}
        continue;
      }
@@ -982,25 +846,21 @@ void *UE_thread(void *arg)
      UE->rx_offset=0;
      UE->time_sync_cell=0;
      // read in first symbol
-      AssertFatal (fp->ofdm_symbol_size+fp->nb_prefix_samples0 ==
+      AssertFatal (UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0 ==
                   UE->rfdevice.trx_read_func(&UE->rfdevice,
                                              &timestamp,
                                              (void **)UE->common_vars.rxdata,
-                                              fp->ofdm_symbol_size+fp->nb_prefix_samples0,
-                                              fp->nb_antennas_rx),"");
-
+                                              UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0,
+                                              UE->frame_parms.nb_antennas_rx),"");
      // we have the decoded frame index in the return of the synch process
      // and we shifted above to the first slot of next frame
      decoded_frame_rx++;
      // we do ++ first in the regular processing, so it will be begin of frame;
-      absolute_slot = decoded_frame_rx * nb_slot_frame - 1;
-      if (UE->sl_mode == 2) {
-        //Set to the slot where the SL-SSB was decoded
-        absolute_slot += UE->SL_UE_PHY_PARAMS.sync_params.slot_offset;
-      }
+      absolute_slot=decoded_frame_rx*nb_slot_frame -1;
      continue;
    }

+
    absolute_slot++;

    int slot_nr = absolute_slot % nb_slot_frame;
@@ -1009,63 +869,24 @@ void *UE_thread(void *arg)
    // update thread index for received subframe
    curMsg.proc.nr_slot_rx  = slot_nr;
    curMsg.proc.nr_slot_tx  = (absolute_slot + DURATION_RX_TO_TX) % nb_slot_frame;
-    curMsg.proc.frame_rx    = (absolute_slot / nb_slot_frame) % MAX_FRAME_NUMBER;
-    curMsg.proc.frame_tx    = ((absolute_slot + DURATION_RX_TO_TX) / nb_slot_frame) % MAX_FRAME_NUMBER;
-    if (UE->phy_config_request_sent) {
-      if (is_sidelink) {
-        NR_UE_MAC_INST_t *mac = get_mac_inst(UE->Mod_id);
-        uint8_t pool_id = 0;
-        // Temporarily setting this to this initial NON_NR_SIDELINK_SLOT slot type.
-        // Later we should properly determine if the current slot is an NR_DOWNLINK_SLOT, NR_UPLINK_SLOT, or NR_MIXED_SLOT
-        curMsg.proc.tx_slot_type = NON_NR_SIDELINK_SLOT;
-        curMsg.proc.rx_slot_type = NON_NR_SIDELINK_SLOT;
+    curMsg.proc.frame_rx    = (absolute_slot/nb_slot_frame) % MAX_FRAME_NUMBER;
+    curMsg.proc.frame_tx    = ((absolute_slot+DURATION_RX_TO_TX)/nb_slot_frame) % MAX_FRAME_NUMBER;
+    curMsg.proc.rx_slot_type = nr_ue_slot_select(cfg, curMsg.proc.frame_rx, curMsg.proc.nr_slot_rx);
+    curMsg.proc.tx_slot_type = nr_ue_slot_select(cfg, curMsg.proc.frame_tx, curMsg.proc.nr_slot_tx);
+    curMsg.proc.decoded_frame_rx=-1;

-        SL_ResourcePool_params_t *sl_tx_rsrc_pool = mac->SL_MAC_PARAMS->sl_TxPool[pool_id];
-        uint16_t phy_map_sz_tx = ((sl_tx_rsrc_pool->phy_sl_bitmap.size << 3) - sl_tx_rsrc_pool->phy_sl_bitmap.bits_unused);
-        bool sl_tx_slot = is_sl_slot(mac, &sl_tx_rsrc_pool->phy_sl_bitmap, phy_map_sz_tx, absolute_slot + DURATION_RX_TO_TX);
-        if (sl_tx_slot) {
-          frameslot_t frame_slot_tx;
-          frame_slot_tx.frame = curMsg.proc.frame_tx;
-          frame_slot_tx.slot = curMsg.proc.nr_slot_tx;
-          validate_selected_sl_slot(true , false, mac->SL_MAC_PARAMS->sl_TDD_config, frame_slot_tx);
-          curMsg.proc.tx_slot_type = NR_SIDELINK_SLOT;
-        }
-
-        SL_ResourcePool_params_t *sl_rx_rsrc_pool = mac->SL_MAC_PARAMS->sl_RxPool[pool_id];
-        uint16_t phy_map_sz_rx = ((sl_rx_rsrc_pool->phy_sl_bitmap.size << 3) - sl_rx_rsrc_pool->phy_sl_bitmap.bits_unused);
-        bool sl_rx_slot = is_sl_slot(mac, &sl_rx_rsrc_pool->phy_sl_bitmap, phy_map_sz_rx, absolute_slot);
-        if (sl_rx_slot) {
-          frameslot_t frame_slot_rx;
-          frame_slot_rx.frame = curMsg.proc.frame_rx;
-          frame_slot_rx.slot = curMsg.proc.nr_slot_rx;
-          validate_selected_sl_slot(false , true, mac->SL_MAC_PARAMS->sl_TDD_config, frame_slot_rx);
-          curMsg.proc.rx_slot_type = NR_SIDELINK_SLOT;
-        }
-
-        LOG_D(NR_PHY,"Setting SL slot type to TX %d.%d %d, RX %d.%d %d\n",
-              curMsg.proc.frame_tx, curMsg.proc.nr_slot_tx, curMsg.proc.tx_slot_type, curMsg.proc.frame_rx, curMsg.proc.nr_slot_rx, curMsg.proc.rx_slot_type);
-      } else {
-        curMsg.proc.rx_slot_type = nr_ue_slot_select(cfg, curMsg.proc.frame_rx, curMsg.proc.nr_slot_rx);
-        curMsg.proc.tx_slot_type = nr_ue_slot_select(cfg, curMsg.proc.frame_tx, curMsg.proc.nr_slot_tx);
-      }
-    }
-    else {
-      curMsg.proc.rx_slot_type = NR_DOWNLINK_SLOT;
-      curMsg.proc.tx_slot_type = NR_DOWNLINK_SLOT;
-    }
-
-    int firstSymSamp = get_firstSymSamp(slot_nr, fp);
-    for (int i=0; i<fp->nb_antennas_rx; i++)
+    int firstSymSamp = get_firstSymSamp(slot_nr, &UE->frame_parms);
+    for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
      rxp[i] = (void *)&UE->common_vars.rxdata[i][firstSymSamp+
-                            fp->get_samples_slot_timestamp(slot_nr,fp,0)];
+               UE->frame_parms.get_samples_slot_timestamp(slot_nr,&UE->frame_parms,0)];

    int readBlockSize, writeBlockSize;

-    readBlockSize = get_readBlockSize(slot_nr, fp);
-    writeBlockSize = fp->get_samples_per_slot((slot_nr + DURATION_RX_TO_TX) % nb_slot_frame, fp);
-    if (UE->apply_timing_offset && (slot_nr == nb_slot_frame - 1)) {
+    readBlockSize=get_readBlockSize(slot_nr, &UE->frame_parms);
+    writeBlockSize=UE->frame_parms.get_samples_per_slot((slot_nr + DURATION_RX_TO_TX) % nb_slot_frame, &UE->frame_parms);
+    if (UE->apply_timing_offset && (slot_nr == nb_slot_frame-1)) {
      const int sampShift = -(UE->rx_offset>>1);
-      readBlockSize -= sampShift;
+      readBlockSize  -= sampShift;
      writeBlockSize -= sampShift;
      UE->apply_timing_offset = false;
    }
@@ -1075,27 +896,27 @@ void *UE_thread(void *arg)
                                           &timestamp,
                                           rxp,
                                           readBlockSize,
-                                           fp->nb_antennas_rx),"");
+                                           UE->frame_parms.nb_antennas_rx),"");

-    if(slot_nr == (nb_slot_frame - 1)) {
+    if( slot_nr==(nb_slot_frame-1)) {
      // read in first symbol of next frame and adjust for timing drift
-      int first_symbols = fp->ofdm_symbol_size + fp->nb_prefix_samples0; // first symbol of every frames
+      int first_symbols=UE->frame_parms.ofdm_symbol_size+UE->frame_parms.nb_prefix_samples0; // first symbol of every frames

-      if (first_symbols > 0) {
+      if ( first_symbols > 0 ) {
        openair0_timestamp ignore_timestamp;
        AssertFatal(first_symbols ==
                    UE->rfdevice.trx_read_func(&UE->rfdevice,
                                               &ignore_timestamp,
                                               (void **)UE->common_vars.rxdata,
                                               first_symbols,
-                                               fp->nb_antennas_rx),"");
+                                               UE->frame_parms.nb_antennas_rx),"");
      } else
        LOG_E(PHY,"can't compensate: diff =%d\n", first_symbols);
    }

    // use previous timing_advance value to compute writeTimestamp
-    writeTimestamp = timestamp +
-      fp->get_samples_slot_timestamp(slot_nr,fp,DURATION_RX_TO_TX)
+    writeTimestamp = timestamp+
+      UE->frame_parms.get_samples_slot_timestamp(slot_nr,&UE->frame_parms,DURATION_RX_TO_TX)
      - firstSymSamp - openair0_cfg[0].tx_sample_advance -
      UE->N_TA_offset - timing_advance;

@@ -1126,6 +947,15 @@ void *UE_thread(void *arg)
    curMsgRx->phy_data = UE_dl_preprocessing(UE, &curMsg.proc);
    pushTpool(&(get_nrUE_params()->Tpool), newElt);

+    if (curMsg.proc.decoded_frame_rx != -1)
+      decoded_frame_rx=(((mac->mib->systemFrameNumber.buf[0] >> mac->mib->systemFrameNumber.bits_unused)<<4) | curMsg.proc.decoded_frame_rx);
+    else
+      decoded_frame_rx=-1;
+
+    if (decoded_frame_rx>0 && decoded_frame_rx != curMsg.proc.frame_rx)
+      LOG_E(PHY,"Decoded frame index (%d) is not compatible with current context (%d), UE should go back to synch mode\n",
+            decoded_frame_rx, curMsg.proc.frame_rx);
+
    // Wait for TX slot processing to finish
    notifiedFIFO_elt_t *res;
    res = pullTpool(&txFifo, &(get_nrUE_params()->Tpool));
@@ -1140,20 +970,16 @@ void *UE_thread(void *arg)

 void init_NR_UE(int nb_inst,
                char* uecap_file,
-                char* rrc_config_path,
-                ueinfo_t* ueinfo) {
+                char* rrc_config_path) {
  int inst;
  NR_UE_MAC_INST_t *mac_inst;
  NR_UE_RRC_INST_t* rrc_inst;
-
+  
  for (inst=0; inst < nb_inst; inst++) {
    AssertFatal((rrc_inst = nr_l3_init_ue(uecap_file,rrc_config_path)) != NULL, "can not initialize RRC module\n");
-    AssertFatal((mac_inst = nr_l2_init_ue(rrc_inst, ueinfo)) != NULL, "can not initialize L2 module\n");
+    AssertFatal((mac_inst = nr_l2_init_ue(rrc_inst)) != NULL, "can not initialize L2 module\n");
    AssertFatal((mac_inst->if_module = nr_ue_if_module_init(inst)) != NULL, "can not initialize IF module\n");
  }
-  if (get_softmodem_params()->sl_mode) {
-    configure_NR_SL_Preconfig(0, get_nrUE_params()->sync_ref);
-  }
 }

 void init_NR_UE_threads(int nb_inst) {
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -86,7 +86,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "nr_nas_msg_sim.h"
 #include <openair1/PHY/MODULATION/nr_modulation.h>
 #include "openair2/GNB_APP/gnb_paramdef.h"
-#include "openair2/RRC/NR_UE/sl_preconfig_paramvalues.h"

 extern const char *duplex_mode[];
 THREAD_STRUCT thread_struct;
@@ -118,8 +117,6 @@ static int      tx_max_power[MAX_NUM_CCs] = {0};
 int      single_thread_flag = 1;
 int                 tddflag = 0;
 int                 vcdflag = 0;
-int          sl_nas_enabled = 0; //SLC Flag
-

 double          rx_gain_off = 0.0;
 char             *usrp_args = NULL;
@@ -315,18 +312,16 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){

 }

-void init_openair0(bool is_sidelink) {
+void init_openair0(void) {
  int card;
  int freq_off = 0;
  NR_DL_FRAME_PARMS *frame_parms = &PHY_vars_UE_g[0][0]->frame_parms;
-  if (is_sidelink)
-    frame_parms = &PHY_vars_UE_g[0][0]->SL_UE_PHY_PARAMS.sl_frame_params;

  for (card=0; card<MAX_CARDS; card++) {
-    uint64_t dl_carrier, ul_carrier;
+    uint64_t dl_carrier, ul_carrier, sl_carrier;
    openair0_cfg[card].configFilename    = NULL;
    openair0_cfg[card].threequarter_fs   = frame_parms->threequarter_fs;
-    openair0_cfg[card].sample_rate       = IS_SOFTMODEM_RFSIM ? frame_parms->samples_per_subframe * 1e3 : 46080000;
+    openair0_cfg[card].sample_rate       = frame_parms->samples_per_subframe * 1e3;
    openair0_cfg[card].samples_per_frame = frame_parms->samples_per_frame;

    if (frame_parms->frame_type==TDD)
@@ -349,14 +344,15 @@ void init_openair0(bool is_sidelink) {
      openair0_cfg[card].rx_num_channels,
      duplex_mode[openair0_cfg[card].duplex_mode]);

-    if (is_sidelink) {
-      dl_carrier = frame_parms->dl_CarrierFreq;
-      ul_carrier = frame_parms->ul_CarrierFreq;
-    } else
-      nr_get_carrier_frequencies(PHY_vars_UE_g[0][0], &dl_carrier, &ul_carrier);
+    nr_get_carrier_frequencies(PHY_vars_UE_g[0][0], &dl_carrier, &ul_carrier);

    nr_rf_card_config_freq(&openair0_cfg[card], ul_carrier, dl_carrier, freq_off);

+    if (get_softmodem_params()->sl_mode == 2) {
+      nr_get_carrier_frequencies_sl(PHY_vars_UE_g[0][0], &sl_carrier);
+      nr_rf_card_config_freq(&openair0_cfg[card], sl_carrier, sl_carrier, freq_off);
+    }
+
    nr_rf_card_config_gain(&openair0_cfg[card], rx_gain_off);

    openair0_cfg[card].configFilename = get_softmodem_params()->rf_config_file;
@@ -451,6 +447,7 @@ int main( int argc, char **argv ) {
  // get options and fill parameters from configuration file

  get_options (); //Command-line options specific for NRUE
+
  get_common_options(SOFTMODEM_5GUE_BIT);
  CONFIG_CLEARRTFLAG(CONFIG_NOEXITONHELP);
 #if T_TRACER
@@ -475,28 +472,17 @@ int main( int argc, char **argv ) {
 #endif
  LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);

-  ueinfo_t ueinfo;
-  char aprefix[MAX_OPTNAME_SIZE*2 + 8];
-  paramdef_t SL_UEINFO[] = SL_UEINFO_DESC(ueinfo);
-  paramlist_def_t SL_UEINFOList = {SL_CONFIG_STRING_UEINFO, NULL, 0};
-  sprintf(aprefix, "%s.[%d]", SL_CONFIG_STRING_SL_PRECONFIGURATION, 0);
-  config_getlist(&SL_UEINFOList, NULL, 0, aprefix);
-  sprintf(aprefix, "%s.[%i].%s.[%i]", SL_CONFIG_STRING_SL_PRECONFIGURATION, 0, SL_CONFIG_STRING_UEINFO, 0);
-  config_get(SL_UEINFO, sizeof(SL_UEINFO)/sizeof(paramdef_t), aprefix);
-
-  init_NR_UE(1, uecap_file, rrc_config_path, &ueinfo);
+  init_NR_UE(1,uecap_file,rrc_config_path);

  int mode_offset = get_softmodem_params()->nsa ? NUMBER_OF_UE_MAX : 1;
  uint16_t node_number = get_softmodem_params()->node_number;
  ue_id_g = (node_number == 0) ? 0 : node_number - 2;
  AssertFatal(ue_id_g >= 0, "UE id is expected to be nonnegative.\n");
-
  if(IS_SOFTMODEM_NOS1 || get_softmodem_params()->sa || get_softmodem_params()->nsa) {
-    if(node_number == 0 && get_softmodem_params()->sl_mode == 0) {
+    if(node_number == 0) {
      init_pdcp(0);
-    } else if (get_softmodem_params()->sl_mode == 2) {
-      init_pdcp(1+ueinfo.srcid);
-    } else {
+    }
+    else {
      init_pdcp(mode_offset + ue_id_g);
    }
  }
@@ -529,14 +515,13 @@ int main( int argc, char **argv ) {
      if (get_softmodem_params()->sa) { // set frame config to initial values from command line and assume that the SSB is centered on the grid
        uint16_t nr_band = get_softmodem_params()->band;
        mac->nr_band = nr_band;
-        mac->ssb_start_subcarrier = UE[CC_id]->frame_parms.ssb_start_subcarrier;
        nr_init_frame_parms_ue_sa(&UE[CC_id]->frame_parms,
                                  downlink_frequency[CC_id][0],
                                  uplink_frequency_offset[CC_id][0],
                                  get_softmodem_params()->numerology,
                                  nr_band);
      }
-      else if (get_softmodem_params()->sl_mode != 2){
+      else{
        DevAssert(mac->if_module != NULL && mac->if_module->phy_config_request != NULL);
        mac->if_module->phy_config_request(&mac->phy_config);
        mac->phy_config_request_sent = true;
@@ -546,34 +531,10 @@ int main( int argc, char **argv ) {
        *mac->scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]);
      }

-      UE[CC_id]->sl_mode = get_softmodem_params()->sl_mode;
-
-      if (UE[CC_id]->sl_mode) {
-        AssertFatal(UE[CC_id]->sl_mode == 2, "Only Sidelink mode 2 supported. Mode 1 not yet supported\n");
-		// starting the sockets between the PC5 Controller and the RRC and the PDCP
-		//nr_rrc_pc5_control_socket_init();
-    if (sl_nas_enabled) {
-        nr_rrc_pc5_control_socket_init();
-        LOG_I(RRC, "[SL-NAS] PC5 controller socket started\n");
-    } else {
-        LOG_I(RRC, "[SL-NAS] PC5 controller socket not started\n");
-    }
-		nr_pdcp_pc5_signaling_socket_init();
-        //
-		nr_UE_configure_Sidelink(0, get_nrUE_params()->sync_ref, &ueinfo);
-        DevAssert(mac->if_module != NULL && mac->if_module->sl_phy_config_request != NULL);
-        sl_nr_ue_phy_params_t *sl_phy = &UE[CC_id]->SL_UE_PHY_PARAMS;
-        mac->if_module->sl_phy_config_request(&mac->SL_MAC_PARAMS->sl_phy_config);
-        nr_init_frame_parms_ue_sl(&sl_phy->sl_frame_params,&sl_phy->sl_config,
-                                  get_nrUE_params()->threequarter_fs,
-                                  get_nrUE_params()->ofdm_offset_divisor);
-      }
      init_nr_ue_vars(UE[CC_id], 0, abstraction_flag);
    }

-    bool is_sl = (get_softmodem_params()->sl_mode) ? 1 : 0;
-
-    init_openair0(is_sl);
+    init_openair0();
    // 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)*NUMBER_OF_UE_MAX*MAX_NUM_CCs);
--- a/executables/nr-uesoftmodem.h
+++ b/executables/nr-uesoftmodem.h
@@ -5,20 +5,13 @@
 #include "PHY/defs_nr_UE.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"

-typedef struct ueinfo {
-  int srcid;
-  int thirdOctet;
-  int fourthOctet;
-} ueinfo_t;
+

 #define  CONFIG_HLP_IF_FREQ                "IF frequency for RF, if needed\n"
 #define  CONFIG_HLP_IF_FREQ_OFF            "UL IF frequency offset for RF, if needed\n"
 #define  CONFIG_HLP_DLSCH_PARA             "number of threads for dlsch processing 0 for no parallelization\n"
 #define  CONFIG_HLP_OFFSET_DIV             "Divisor for computing OFDM symbol offset in Rx chain (num samples in CP/<the value>). Default value is 8. To set the sample offset to 0, set this value ~ 10e6\n"
 #define  CONFIG_HLP_MAX_LDPC_ITERATIONS    "Maximum LDPC decoder iterations\n"
-#define  CONFIG_HLP_SL_SYNCSOURCEUE        "Sidelink UE acts as SYNC REF UE"
-#define  CONFIG_HLP_SL_MAX_MCS             "Sidelink initial max mcs value"
-#define  CONFIG_HLP_SL_SNR                 "Sets sidelink SNR value"
 /***************************************************************************************************************************************/
 /* command line options definitions, CMDLINE_XXXX_DESC macros are used to initialize paramdef_t arrays which are then used as argument
   when calling config_get or config_getlist functions                                                                                 */
@@ -31,7 +24,6 @@ typedef struct ueinfo {
 #define CALIBPRACH_OPT    "calib-prach-tx"
 #define DUMPFRAME_OPT     "ue-dump-frame"

-#define SL_UE_iterator(BaSe, VaR) NR_SL_UE_info_t ** VaR##pptr=BaSe, *VaR; while ((VaR=*(VaR##pptr++)))
 /*------------------------------------------------------------------------------------------------------------------------------------------*/
 /*                                            command line parameters defining UE running mode                                              */
 /*   optname                     helpstr                paramflags                      XXXptr        defXXXval         type       numelt   */
@@ -69,10 +61,6 @@ typedef struct ueinfo {
  {"chest-time",                   CONFIG_HLP_CHESTTIME,       0,               .iptr=&(nrUE_params.chest_time),             .defintval=0,      TYPE_INT,      0}, \
  {"ue-timing-correction-disable", CONFIG_HLP_DISABLETIMECORR, PARAMFLAG_BOOL,  .iptr=&(nrUE_params.no_timing_correction),   .defintval=0,      TYPE_INT,      0}, \
  {"SLC",                          CONFIG_HLP_SLF,             0,               .u64ptr=&(sidelink_frequency[0][0]),         .defuintval=2600000000,TYPE_UINT64,0}, \
-  {"sync-ref",                     CONFIG_HLP_SL_SYNCSOURCEUE, PARAMFLAG_BOOL,  .uptr=&(nrUE_params.sync_ref),               .defuintval=0,     TYPE_UINT32,   0}, \
-  {"sl-nas",     "Enable SL-NAS PC5 controller socket\n", PARAMFLAG_BOOL, .iptr=&sl_nas_enabled, .defintval=0, TYPE_INT, 0}, \  
-  {"mcs",                          CONFIG_HLP_SL_MAX_MCS,      0,               .u8ptr=&(nrUE_params.mcs),                   .defintval=9,      TYPE_UINT8,    0}, \
-  {"snr",                          CONFIG_HLP_SL_SNR,          0,               .dblptr=&(nrUE_params.snr),                  .defdblval=0.0,                TYPE_DOUBLE,   0}, \
 }
 // clang-format on

@@ -94,9 +82,6 @@ typedef struct {
  int            threequarter_fs;
  int            N_RB_DL;
  int            ssb_start_subcarrier;
-  uint32_t       sync_ref;
-  uint8_t        mcs;
-  double         snr;
 } nrUE_params_t;
 extern uint64_t get_nrUE_optmask(void);
 extern uint64_t set_nrUE_optmask(uint64_t bitmask);
@@ -106,7 +91,7 @@ extern nrUE_params_t *get_nrUE_params(void);
 // In nr-ue.c
 extern int setup_nr_ue_buffers(PHY_VARS_NR_UE **phy_vars_ue, openair0_config_t *openair0_cfg);
 extern void fill_ue_band_info(void);
-extern void init_NR_UE(int, char*, char*, ueinfo_t*);
+extern void init_NR_UE(int, char*, char*);
 extern void init_NR_UE_threads(int);
 extern void reset_opp_meas(void);
 extern void print_opp_meas(void);
@@ -114,6 +99,4 @@ extern void start_oai_nrue_threads(void);
 void *UE_thread(void *arg);
 void init_nr_ue_vars(PHY_VARS_NR_UE *ue, uint8_t UE_id, uint8_t abstraction_flag);
 void init_nrUE_standalone_thread(int ue_idx);
-
-extern int sl_nas_enabled; //SLC Flag
 #endif
--- a/nfapi/oai_integration/nfapi_vnf.c
+++ b/nfapi/oai_integration/nfapi_vnf.c
@@ -763,11 +763,11 @@ int phy_nr_uci_indication(nfapi_nr_uci_indication_t *ind)
  if(NFAPI_MODE == NFAPI_MODE_VNF)
  {
    nfapi_nr_uci_indication_t *uci_ind = CALLOC(1, sizeof(*uci_ind));
-    AssertFatal(uci_ind != NULL, "Memory not allocated for uci_ind in phy_nr_uci_indication.");
+    AssertFatal(uci_ind, "Memory not allocated for uci_ind in phy_nr_uci_indication.");
    *uci_ind = *ind;

    uci_ind->uci_list = CALLOC(NFAPI_NR_UCI_IND_MAX_PDU, sizeof(nfapi_nr_uci_t));
-    AssertFatal(uci_ind->uci_list != NULL, "Memory not allocated for uci_ind->uci_list in phy_nr_uci_indication.");
+    AssertFatal(uci_ind->uci_list, "Memory not allocated for uci_ind->uci_list in phy_nr_uci_indication.");
    for (int i = 0; i < ind->num_ucis; i++)
    {
      uci_ind->uci_list[i] = ind->uci_list[i];
--- a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
@@ -119,8 +119,6 @@ typedef struct {
 typedef struct {
  uint8_t harq_pid;
  uint8_t ack_nack;
-  uint8_t *ack_nack_rcvd;
-  uint8_t  num_acks_rcvd;
  uint32_t pdu_length;
  uint8_t* pdu;
 } fapi_nr_pdsch_pdu_t;
--- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
@@ -942,7 +942,6 @@ typedef struct
  uint16_t scramb_id;               // ScramblingID of the CSI-RS [3GPP TS 38.214, sec 5.2.2.3.1], Value: 0->1023
  uint8_t power_control_offset;     // Ratio of PDSCH EPRE to NZP CSI-RSEPRE [3GPP TS 38.214, sec 5.2.2.3.1], Value: 0->23 representing -8 to 15 dB in 1dB steps; 255: L1 is configured with ProfileSSS
  uint8_t power_control_offset_ss;  // Ratio of NZP CSI-RS EPRE to SSB/PBCH block EPRE [3GPP TS 38.214, sec 5.2.2.3.1], Values: 0: -3dB; 1: 0dB; 2: 3dB; 3: 6dB; 255: L1 is configured with ProfileSSS
-  uint8_t measurement_bitmap;
 } nfapi_nr_dl_tti_csi_rs_pdu_rel15_t;


--- a/nfapi/open-nFAPI/nfapi/public_inc/sidelink_nr_ue_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/sidelink_nr_ue_interface.h
@@ -1,459 +0,0 @@
-#ifndef _SIDELINK_NR_UE_INTERFACE_H_
-#define _SIDELINK_NR_UE_INTERFACE_H_
-
-#include "fapi_nr_ue_interface.h"
-
-#define SL_NR_RX_CONFIG_LIST_NUM 1
-#define SL_NR_TX_CONFIG_LIST_NUM 1 //Jin original 1, change to 2
-#define SL_NR_RX_IND_MAX_PDU 2
-#define SL_NR_SCI_IND_MAX_PDU 2
-#define SL_NR_MAX_PSCCH_SCI_LENGTH_IN_BYTES 8
-#define SL_NR_MAX_PSSCH_SCI_LENGTH_IN_BYTES 8
-#define SL_NR_MAX_SCI_LENGTH_IN_BYTES 8
-
-typedef struct sl_nr_tti_csi_rs_pdu {
-  uint8_t subcarrier_spacing;       // subcarrierSpacing [3GPP TS 38.211, sec 4.2], Value:0->4
-  uint8_t cyclic_prefix;            // Cyclic prefix type [3GPP TS 38.211, sec 4.2], 0: Normal; 1: Extended
-  uint16_t start_rb;                // PRB where this CSI resource starts related to common resource block #0 (CRB#0). Only multiples of 4 are allowed. [3GPP TS 38.331, sec 6.3.2 parameter CSIFrequencyOccupation], Value: 0 ->274
-  uint16_t nr_of_rbs;               // Number of PRBs across which this CSI resource spans. Only multiples of 4 are allowed. [3GPP TS 38.331, sec 6.3.2 parameter CSI-FrequencyOccupation], Value: 24 -> 276
-  uint8_t csi_type;                 // CSI Type [3GPP TS 38.211, sec 7.4.1.5], Value: 0:TRS; 1:CSI-RS NZP; 2:CSI-RS ZP
-  uint8_t row;                      // Row entry into the CSI Resource location table. [3GPP TS 38.211, sec 7.4.1.5.3 and table 7.4.1.5.3-1], Value: 1-18
-  uint16_t freq_domain;             // Bitmap defining the frequencyDomainAllocation [3GPP TS 38.211, sec 7.4.1.5.3] [3GPP TS 38.331 CSIResourceMapping], Value: Up to the 12 LSBs, actual size is determined by the Row parameter
-  uint8_t symb_l0;                  // The time domain location l0 and firstOFDMSymbolInTimeDomain [3GPP TS 38.211, sec 7.4.1.5.3], Value: 0->13
-  uint8_t symb_l1;                  // The time domain location l1 and firstOFDMSymbolInTimeDomain2 [3GPP TS 38.211, sec 7.4.1.5.3], Value: 2->12
-  uint8_t cdm_type;                 // The cdm-Type field [3GPP TS 38.211, sec 7.4.1.5.3 and table 7.4.1.5.3-1], Value: 0: noCDM; 1: fd-CDM2; 2: cdm4-FD2-TD2; 3: cdm8-FD2-TD4
-  uint8_t freq_density;             // The density field, p and comb offset (for dot5). [3GPP TS 38.211, sec 7.4.1.5.3 and table 7.4.1.5.3-1], Value: 0: dot5 (even RB); 1: dot5 (odd RB); 2: one; 3: three
-  uint16_t scramb_id;               // ScramblingID of the CSI-RS [3GPP TS 38.214, sec 5.2.2.3.1], Value: 0->1023
-  uint8_t power_control_offset;     // Ratio of PDSCH EPRE to NZP CSI-RSEPRE [3GPP TS 38.214, sec 5.2.2.3.1], Value: 0->23 representing -8 to 15 dB in 1dB steps; 255: L1 is configured with ProfileSSS
-  uint8_t power_control_offset_ss;  // Ratio of NZP CSI-RS EPRE to SSB/PBCH block EPRE [3GPP TS 38.214, sec 5.2.2.3.1], Values: 0: -3dB; 1: 0dB; 2: 3dB; 3: 6dB; 255: L1 is configured with ProfileSSS
-  uint8_t measurement_bitmap;       // bit 0 RSRP, bit 1 RI, bit 2 LI, bit 3 PMI, bit 4 CQI, bit 5 i1
-} sl_nr_tti_csi_rs_pdu_t;
-
-typedef enum sl_sci_format_type_enum {
-  SL_SCI_INVALID_FORMAT,
-  SL_SCI_FORMAT_1A_ON_PSCCH,
-  SL_SCI_FORMAT_2_ON_PSSCH,
-} sl_sci_format_type_enum_t;
-
-//Type of Contents of SL-RX indication from PHY to MAC
-typedef enum sl_rx_pdu_type_enum {
-  SL_NR_RX_PDU_TYPE_NONE,
-  SL_NR_RX_PDU_TYPE_SSB,
-  SL_NR_RX_PDU_TYPE_SLSCH,
-  SL_NR_RX_PDU_TYPE_SLSCH_PSFCH,
-} sl_rx_pdu_type_enum_t;
-
-//Type of SL-RX CONFIG requests from MAC to PHY
-typedef enum sl_nr_rx_config_type_enum {
-  SL_NR_CONFIG_TYPE_RX_PSBCH = 1,
-  SL_NR_CONFIG_TYPE_RX_PSCCH,
-  SL_NR_CONFIG_TYPE_RX_PSSCH_SCI,
-  SL_NR_CONFIG_TYPE_RX_PSSCH_SLSCH,
-  SL_NR_CONFIG_TYPE_RX_PSSCH_SLSCH_PSFCH,
-  SL_NR_CONFIG_TYPE_RX_PSSCH_SLSCH_CSI_RS,
-  SL_NR_CONFIG_TYPE_RX_MAXIMUM
-} sl_nr_rx_config_type_enum_t;
-
-//Type of SL-TX CONFIG requests from MAC to PHY
-typedef enum sl_nr_tx_config_type_enum {
-  SL_NR_CONFIG_TYPE_TX_PSBCH = SL_NR_CONFIG_TYPE_RX_MAXIMUM + 1,
-  SL_NR_CONFIG_TYPE_TX_PSCCH_PSSCH,
-  SL_NR_CONFIG_TYPE_TX_PSCCH_PSSCH_PSFCH,
-  SL_NR_CONFIG_TYPE_TX_PSCCH_PSSCH_CSI_RS,
-  SL_NR_CONFIG_TYPE_TX_MAXIMUM
-} sl_nr_tx_config_type_enum_t;
-
-//PHY Indicates MAC about the SCI-indication
-//During blind decoding, SCI-1A can be decoded in every subchannel.
-typedef struct {
-  sl_sci_format_type_enum_t sci_format_type; // SCI FORMAT 1A or SCI FORMAT 2
-  // lowest subchannel index in the resource pool where the SCI-1A was detected
-  // Not used for SCI-2
-  uint16_t subch_index;
-  //RSRP sent in case of sense pscch
-  int16_t  pscch_rsrp;
-  //Length of SCI decoded
-  uint16_t sci_payloadlen;
-  //Derived from PSCCH CRC Refer 38.211 section 8.3.1.1
-  //Will be passed on if PSSCH decoding needs to be done.
-  //Filled only if PSCCH decoded
-  uint16_t Nid;
-  // Payload of the received SCIs
-  uint8_t sci_payloadBits[SL_NR_MAX_SCI_LENGTH_IN_BYTES];
-} sl_nr_sci_indication_pdu_t;
-
-// PHY indicates MAC about the received SCIs using this API
-typedef struct {
-  uint16_t sfn;
-  uint8_t slot;
-  uint16_t number_of_SCIs;
-  //If response to sensing - then this will be set to TRUE
-  uint8_t sensing_result;
-  //in case pssch sensing is requested.
-  int16_t pssch_rsrp;
-  sl_nr_sci_indication_pdu_t sci_pdu[SL_NR_SCI_IND_MAX_PDU];
-} sl_nr_sci_indication_t;
-
-// IF UE Rx PSBCH, PHY indicates MAC with received MIB and PSBCH RSRP
-typedef struct sl_nr_ssb_pdu {
-  uint8_t psbch_payload[4];
-  int16_t rsrp_dbm;
-  uint16_t rx_slss_id;
-  bool decode_status;
-} sl_nr_ssb_pdu_t;
-
-//Use the same structure of pdsch pdu for slsch pdu
-typedef fapi_nr_pdsch_pdu_t sl_nr_slsch_pdu_t;
-
-typedef struct {
-  sl_rx_pdu_type_enum_t pdu_type;
-  union {
-    sl_nr_ssb_pdu_t ssb_pdu;
-    sl_nr_slsch_pdu_t rx_slsch_pdu;
-  };
-} sl_nr_rx_indication_body_t;
-
-typedef struct {
-  uint16_t sfn;
-  uint16_t slot;
-  uint16_t number_pdus;
-  sl_nr_rx_indication_body_t rx_indication_body[SL_NR_RX_IND_MAX_PDU];
-} sl_nr_rx_indication_t;
-
-typedef struct sl_nr_rx_config_pscch_pdu {
-  // Starting RE of the lowest subchannel in a resource where PSCCH
-  // freq domain allocation starts
-  uint16_t pscch_startrb;
-  // Number of symbols used for PSCCH
-  uint16_t pscch_numsym;
-  // Number of  RBS used for PSCCH
-  uint16_t pscch_numrbs;
-  // Scrambling Id used for Generation of PSCCH DMRS Symbols
-  uint32_t pscch_dmrs_scrambling_id;
-  // num subchannels in a resource pool
-  uint16_t num_subch;
-  // Size of subchannels in RBs
-  uint16_t subchannel_size;
-  // PSCCH PSSCH RX: this is set to 1 - Blind decoding for SCI1A done on every subchannel
-  // PSCCH SENSING: this is equal to number of subchannels forming a resource.
-  uint16_t l_subch;
-  //number of symbols for Sidelink transmission on PSSCH/PSCCH
-  //(Total Sidelink symbols available - number of psfch symbols configured - 2)
-  //Guard symbol + AGC symbol are also excluded
-  //Indicates the number of symbols for PSCCH+PSSCH txn
-  uint8_t pssch_numsym;
-  //sci 1A length used to decode on PSCCH.
-  uint8_t sci_1a_length;
-  //This paramter is set if PSCCH RX is triggered on TX resource pool
-  // as part of TX pool sensing procedure.
-  uint8_t sense_pscch;
-} sl_nr_rx_config_pscch_pdu_t;
-
-typedef struct sl_nr_rx_config_pssch_sci_pdu {
-  // Expected Length of SCI2 in bits
-  uint8_t sci2_len;
-  // Used to determine number of SCI2 modulated symbols
-  uint8_t sci2_beta_offset;
-  // Used to determine number of SCI2 modulated symbols
- //Values will be sl-scaling*100 (sl-scaling values 0.5, 0.65, 0.8, 1)
-  uint8_t sci2_alpha_times_100;
-
-  uint16_t targetCodeRate;
-  uint8_t mod_order;
-  uint8_t num_layers;
-
-  //DMRS SYMBOL MASK. If bit set to 1 indicates it is a DMRS symbol. LSB is symbol 0
-  // Table from SPEC 38.211, Table 8.4.1.1.2-1
-  uint16_t dmrs_symbol_position;
-
-  // Derived from PSCCH CRC Refer 38.211 section 8.3.1.1
-  // to be used for PSSCH DMRS and PSSCH 38.211 Scrambling
-  uint16_t Nid;
-
-  // Starting RE of the lowest subchannel.
-  //In Sym with PSCCH - Start of PSCCH
-  //In Sym without PSCCH - Start of PSSCH
-  // freq domain allocation starts
-  uint16_t startrb;
-  // Number of symbols used for PSCCH
-  uint16_t pscch_numsym;
-  // Number of  RBS used for PSCCH
-  uint16_t pscch_numrbs;
-  // num subchannels in a resource pool
-  uint16_t num_subch;
-  // Size of subchannels in RBs
-  uint16_t subchannel_size;
-  // In case of PSCCH PSSCH RX: this is always 1. Blind decoding done for every channel
-  // In case of RESOURCE SENSING: this is equal to number of subchannels forming a resource.
-  uint16_t l_subch;
-  //number of symbols for Sidelink transmission on PSSCH/PSCCH
-  //(Total Sidelink symbols available - number of psfch symbols configured - 2)
-  //Guard symbol + AGC symbol are also excluded
-  //Indicates the number of symbols for PSCCH+PSSCH txn
-  uint8_t pssch_numsym;
-
-  //This paramter is set if PSSCH sensing (PSSCH DMRS RSRP measurement)
-  // is triggred as part of TX pool sensing procedure.
-  uint8_t sense_pssch;
-
-} sl_nr_rx_config_pssch_sci_pdu_t;
-
-typedef struct sl_nr_rx_config_pssch_pdu {
-  uint32_t tbslbrm;
-  // Transport block size determined by MAC
-  uint32_t tb_size;
-  uint16_t target_coderate;
-  uint8_t  harq_pid;
-  uint8_t  mod_order;
-  uint8_t  mcs;
-  uint8_t  mcs_table;
-  uint8_t  num_layers;
- //REdundancy version to be used for transmission
-  uint8_t rv_index;
-  uint8_t ndi;
-} sl_nr_rx_config_pssch_pdu_t;
-
-typedef struct sl_nr_tx_rx_config_psfch_pdu {
-  //  These fields can be mapped directly to the same fields in nfapi_nr_ul_config_pucch_pdu
-  uint8_t freq_hop_flag;
-  uint8_t group_hop_flag;
-  uint8_t sequence_hop_flag;
-  uint16_t second_hop_prb;
-  uint8_t nr_of_symbols;
-  uint8_t start_symbol_index;
-  uint8_t hopping_id;
-  uint16_t prb;
-  uint16_t sl_bwp_start;
-  uint16_t initial_cyclic_shift;
-  uint8_t mcs;
-  uint8_t bit_len_harq;
-} sl_nr_tx_rx_config_psfch_pdu_t;
-
-typedef struct {
-  sl_nr_rx_config_type_enum_t pdu_type; // indicates the type of RX config request
-  union {
-    sl_nr_rx_config_pscch_pdu_t rx_pscch_config_pdu;
-    sl_nr_rx_config_pssch_sci_pdu_t rx_sci2_config_pdu;
-    sl_nr_rx_config_pssch_pdu_t rx_pssch_config_pdu;
-  };
-  sl_nr_tti_csi_rs_pdu_t rx_csi_rs_config_pdu;
-  sl_nr_tx_rx_config_psfch_pdu_t *rx_psfch_pdu_list;
-  uint16_t num_psfch_pdus;
-} sl_nr_rx_config_request_pdu_t;
-
-// MAC commands PHY to perform an action on RX RESOURCE POOL or RX PSBCH using this RX CONFIG
-// at this TTI as indicated in sfn, slot
-typedef struct {
-  uint16_t sfn;
-  uint16_t slot;
-  uint8_t number_pdus;
-  sl_nr_rx_config_request_pdu_t sl_rx_config_list[SL_NR_RX_CONFIG_LIST_NUM];
-} sl_nr_rx_config_request_t;
-
-//MAC commands PHY to transmit Data on PSCCH, PSSCH.
-typedef struct sl_nr_tx_config_pscch_pssch_pdu {
-
-  //SCI 1A Payload Prepared by MAC, to be sent on PSCCH
-  uint8_t pscch_sci_payload[SL_NR_MAX_PSCCH_SCI_LENGTH_IN_BYTES];
-  //SCI 1A Payload Length in bits
-  uint8_t pscch_sci_payload_len;
-  //SCI 2 Payload Prepared by MAC and to be sent on PSSCH
-  uint8_t sci2_payload[SL_NR_MAX_PSSCH_SCI_LENGTH_IN_BYTES];
-  //SCI 2 Payload Length in bits
-  uint8_t sci2_payload_len;
-
-  // Starting RE of the lowest subchannel.
-  //In Sym with PSCCH - Start of PSCCH
-  //In Sym without PSCCH - Start of PSSCH
-  // freq domain allocation starts
-  uint16_t startrb;
-  // Number of symbols used for PSCCH
-  uint16_t pscch_numsym;
-  // Number of  RBS used for PSCCH
-  uint16_t pscch_numrbs;
-  // Scrambling Id used for Generation of PSCCH DMRS Symbols
-  uint32_t pscch_dmrs_scrambling_id;
-  // num subchannels in a resource pool
-  uint16_t num_subch;
-  // Size of subchannels in RBs
-  uint16_t subchannel_size;
-  //PSCCH PSSCH TX: Size of subchannels in a PSSCH resource (l_subch)
-  uint16_t l_subch;
-  //number of symbols for Sidelink transmission on PSSCH/PSCCH
-  //(Total Sidelink symbols available - number of psfch symbols configured - 2)
-  //Guard symbol + AGC symbol are also excluded
-  //Indicates the number of symbols for PSCCH+PSSCH txn
-  uint8_t pssch_numsym;
-
-  // start symbol of PSCCH/PSSCH (excluding AGC)
-  uint8_t pssch_startsym;
-
-  //.... Other Parameters for SCI-2 and PSSCH
-
-  // Used to determine number of SCI2 modulated symbols
-  uint8_t sci2_beta_offset;
-  //Values will be sl-scaling*100 (sl-scaling values 0.5, 0.65, 0.8, 1)
-  uint8_t sci2_alpha_times_100;
-
-  uint32_t tbslbrm;
-  uint32_t tb_size;
-  uint16_t target_coderate;
-  uint8_t  harq_pid;
-  uint8_t  mod_order;
-  uint8_t  mcs;
-  uint8_t  mcs_table;
-  uint8_t  num_layers;
-  uint8_t rv_index;
-  uint8_t ndi;
-
-  //DMRS SYMBOL MASK. If bit set to 1 indicates it is a DMRS symbol. LSB is symbol 0
-  // Table from SPEC 38.211, Table 8.4.1.1.2-1
-  uint16_t dmrs_symbol_position;
-
-  // PSFCH related parameters
-  sl_nr_tx_rx_config_psfch_pdu_t *psfch_pdu_list;
-  uint16_t num_psfch_pdus;
-  //....TBD.. any additional parameters
-
-  // CSI-RS related parameters
-  sl_nr_tti_csi_rs_pdu_t nr_sl_csi_rs_pdu;
-
-  //TX Power for PSSCH in symbol without PSCCH.
-  // Power for PSCCH and power for PSSCH in symbol with PSCCH is calculated
-  // from this value according to 38.213 section 16
-  int16_t pssch_tx_power;
-
-  uint16_t slsch_payload_length;
-  uint8_t *slsch_payload;
-} sl_nr_tx_config_pscch_pssch_pdu_t;
-
-// MAC indicates PHY to send PSBCH.
-typedef struct sl_nr_tx_config_psbch_pdu {
-
-  uint8_t psbch_payload[4]; // payload containing sl-MIB
-  uint16_t tx_slss_id; // slss_id selected by RRC and to be used for MIB transmission on PSBCH
-  int16_t psbch_tx_power; // TX Power used for sending PSBCH
-
-} sl_nr_tx_config_psbch_pdu_t;
-
-// MAC commands PHY to perform an action on TX RESOURCE POOL or TX PSBCH using this TX CONFIG
-typedef struct {
-  sl_nr_tx_config_type_enum_t pdu_type; // indicates the type of TX config request
-  union {
-    sl_nr_tx_config_psbch_pdu_t tx_psbch_config_pdu;
-    sl_nr_tx_config_pscch_pssch_pdu_t tx_pscch_pssch_config_pdu;
-  };
-} sl_nr_tx_config_request_pdu_t;
-
-// MAC commands PHY to perform an action on TX RESOURCE POOL or TX PSBCH using this TX CONFIG
-// at this TTI as indicated in sfn, slot
-typedef struct {
-  uint16_t sfn;
-  uint16_t slot;
-  uint8_t number_pdus;
-  sl_nr_tx_config_request_pdu_t tx_config_list[SL_NR_TX_CONFIG_LIST_NUM];
-} sl_nr_tx_config_request_t;
-
-typedef enum sl_sync_source_enum {
-
- SL_SYNC_SOURCE_NONE = 0,
- SL_SYNC_SOURCE_GNBENB, // NR-CELL as sync source
- SL_SYNC_SOURCE_GNSS, // GPS as sync source
- SL_SYNC_SOURCE_SYNC_REF_UE, // another SYNC REF UE as sync source
- SL_SYNC_SOURCE_LOCAL_TIMING, // if LOCAL UE timing is sync source , if above options are not available
- SL_SYNC_SOURCE_MAX
-
-} sl_sync_source_enum_t ;
-
-
-typedef struct sl_nr_ue_bwp_config {
-
-  uint16_t sl_bwp_start; // BWP start RB
-  uint16_t sl_bwp_size;  // BWP Size in number of RBs
-  uint16_t sl_ssb_offset_point_a; // offset in REs from PointA to indicate SSB location
-  uint16_t sl_dc_location; // DC location in SL-BWP
-  uint8_t sl_num_symbols; // number of sidelink symbols in a non PSBCH sidelink slot
-  uint8_t sl_start_symbol;// start sidelink symbol in a non PSBCH sidelink slot
-  uint8_t  sl_scs; // sub carrier spacing of SL-BWP and SL-SSB
-  uint8_t  sl_cyclic_prefix; // cyclic prefix of SL-BWP and SL-SSB 0- normal, 1-extended which is not supported
-
-} sl_nr_bwp_config_t;
-
-typedef struct sl_nr_ue_sync_source_config {
-
-  // Sync source selected by the UE
-  sl_sync_source_enum_t sync_source;
-
-  // if GNSS is sync source - used in DFN calculation from GNSS timing
-  //field sl-OffsetDFN, Section 5.8.12 in 38.331
-  // value from 0 to 1000,
-  uint16_t gnss_dfn_offset;
-
-  //Only sent if sync_source is set to SYNC_SOURCE_SYNC_REF_UE
-  //Valid values can be 0-671
-  uint16_t rx_slss_id;
-
-} sl_nr_sync_source_config_t;
-
-typedef struct 
-{
-  // REference Rel16 38.101, 38.331
-  //For NR-Sidelink operation on PC5 interface
-  //Sidelink bandwidth configured - 10, 20, 30, and 40Mhz
-  uint16_t sl_bandwidth;
-  //Absolute frequency of SL point A in KHz
-  //n38 (2570-2620 Mhz), n47 (5855-5925 Mhz) are defined.
-  uint64_t sl_frequency;
-
-  //Only 1 SCS-SpecificCarrier allowed for NR-SL communication
-  uint16_t sl_grid_size;// bandwidth for each numerology
-  uint16_t sl_num_tx_ant;//Number of Tx antennae - value 1
-  uint16_t sl_num_rx_ant;//Number of Rx antennae - value 1
-
-  //Indicates presence of 7.5KHz frequency shift wrt LTE anchor cell.
-  //Value: 0 = false 1 = true
-  uint8_t  sl_frequency_shift_7p5khz;
-  //Indicates presence of +/-5Khz shift wrt FREF for V2X reference frequencies.
-  //Possible values: {-1,0,1}
-  int8_t  sl_value_N;
-
-} sl_nr_carrier_config_t;
-
-
-typedef struct {
-  // Mask indicating which of the below configs are changed
-  // Bit0 - carrier_config, Bit1 - syncsource cfg
-  // Bit2 - tdd config, Bit3 - bwp config
-  uint32_t config_mask;
-
-  sl_nr_carrier_config_t sl_carrier_config;
-  sl_nr_sync_source_config_t sl_sync_source;
-  //TDD config either from SL-PRECONFIG or read from SL-MIB
-  //In case of TDD-config available from gNB, tdd_table from NR PHY config will be used
-  fapi_nr_tdd_table_t tdd_table;
-  //only 1 SL-BWP can be configured in REL16, REL17
-  sl_nr_bwp_config_t sl_bwp_config;
-
-  uint32_t sl_DMRS_ScrambleId;
-
-} sl_nr_phy_config_request_t;
-
-/* Dependencies */
-typedef enum NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR {
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_NOTHING,	/* No components present */
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots4,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots5,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots8,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots10,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots16,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots20,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots32,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots40,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots64,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots80,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots160,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots320,
-	NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR_slots640
-} NR_UE_SL_CSI_ResourcePeriodicityAndOffset_PR;
-
-#endif
--- a/nfapi/open-nFAPI/nfapi/src/nfapi_p4.c
+++ b/nfapi/open-nFAPI/nfapi/src/nfapi_p4.c
@@ -1485,9 +1485,9 @@ static int check_unpack_length(nfapi_message_id_e msgId, uint32_t unpackedBufLen

 int nfapi_p4_message_pack(void *pMessageBuf, uint32_t messageBufLen, void *pPackedBuf, uint32_t packedBufLen, nfapi_p4_p5_codec_config_t *config) {
  nfapi_p4_p5_message_header_t *pMessageHeader = pMessageBuf;
-  uint8_t *end = pPackedBuf + packedBufLen;
-  uint8_t *pWritePackedMessage = pPackedBuf;
-  uint8_t *pPackedLengthField = &pWritePackedMessage[4];
+  uint8_t *end = (pPackedBuf == NULL) ? NULL : (uint8_t *)pPackedBuf + packedBufLen;
+  uint8_t *pWritePackedMessage = (pPackedBuf == NULL) ? NULL : (uint8_t *)pPackedBuf;
+  uint8_t *pPackedLengthField = (pPackedBuf == NULL) ? NULL : &pWritePackedMessage[4];
  uint32_t packedMsgLen;
  uint16_t packedMsgLen16;

--- a/openair1/PHY/CODING/crc_byte.c
+++ b/openair1/PHY/CODING/crc_byte.c
@@ -339,10 +339,6 @@ int check_crc(uint8_t* decoded_bytes, uint32_t n, uint8_t crc_type)
  for (int i=0; i<crc_len; i++)
    oldcrc |= (decoded_bytes[(n>>3)-crc_len+i])<<((crc_len-1-i)<<3);

-  if (oldcrc == 0) {
-    return 0;
-  }
-
  switch (crc_type) {
    
  case CRC24_A:
--- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
+++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
@@ -451,15 +451,11 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr,
    // Parity Check not necessary here since it will fail
    // because first 2 cols/BNs in BG are punctured and cannot be
    // estimated after only one iteration
-    // Added 2 to numMaxIter to execute ldpc process five times (max. iterations);
-    // it is skipping first two iterations so, previously, it was iterating only three times
-    // In case of check_crc() pass, we subtracted 2 to consider upto 7 iterations (worst case) only; in case of iteration 8,
-    // it will still consider the ldpc decoding as abort

    // First iteration finished
    uint32_t numIter = 1;
    int32_t pcRes = 1; // pcRes is 0 if the ldpc decoder is succesful
-    while ((numIter <= numMaxIter + 2) && (pcRes != 0)) {
+    while ((numIter <= numMaxIter) && (pcRes != 0)) {
      // Increase iteration counter
      numIter++;
      if (check_abort(ab)) {
@@ -717,7 +713,6 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr,
            nrLDPC_llr2bit(p_out, p_llrOut, numLLR);
          if (check_crc((uint8_t*)p_out, p_decParams->block_length, p_decParams->crc_type)) {
            LOG_D(PHY, "Segment CRC OK, exiting LDPC decoder\n");
-            numIter -= 2;
            break;
          }
        }
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h
@@ -34,8 +34,6 @@
 #define __NR_POLAR_DCI_DEFS__H__

 #define NR_POLAR_DCI_MESSAGE_TYPE 1 //int8_t
-#define NR_POLAR_SCI_MESSAGE_TYPE (NR_POLAR_PSBCH_MESSAGE_TYPE + 1) //int8_t
-#define NR_POLAR_SCI2_MESSAGE_TYPE (NR_POLAR_SCI_MESSAGE_TYPE + 1) //int8_t
 #define NR_POLAR_DCI_CRC_PARITY_BITS 24
 #define NR_POLAR_DCI_CRC_ERROR_CORRECTION_BITS 3

--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
@@ -607,7 +607,6 @@ void init_polar_deinterleaver_table(t_nrPolar_params *polarParams) {

 uint32_t polar_decoder_int16(int16_t *input,
                             uint64_t *out,
-                             uint16_t *nid,
                             uint8_t ones_flag,
                             int8_t messageType,
                             uint16_t messageLength,
@@ -616,7 +615,7 @@ uint32_t polar_decoder_int16(int16_t *input,
  t_nrPolar_params *polarParams=nr_polar_params(messageType, messageLength, aggregation_level, true);

 #ifdef POLAR_CODING_DEBUG
-  printf("\nRX N %d (messageType %d messageLength %d aggregation_level %d)\n",polarParams->N,messageType,messageLength,aggregation_level);
+  printf("\nRX\n");
  printf("rm:");
  for (int i = 0; i < polarParams->N; i++) {
    if (i % 4 == 0) {
@@ -795,6 +794,5 @@ uint32_t polar_decoder_int16(int16_t *input,
 #endif
  out[0]=Ar;

-  if (nid) *nid=crc&65535;
  polarReturn crc^rxcrc;
 }
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
@@ -153,7 +153,6 @@ void polar_encoder_dci(uint32_t *in,

 void polar_encoder_fast(uint64_t *A,
                        void *out,
-                        uint32_t *crc,
                        int32_t crcmask,
                        uint8_t ones_flag,
                        int8_t messageType,
@@ -169,7 +168,6 @@ int8_t polar_decoder(double *input,

 uint32_t polar_decoder_int16(int16_t *input,
                             uint64_t *out,
-                             uint16_t *nid,
                             uint8_t ones_flag,
                             int8_t messageType,
                             uint16_t messageLength,
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
@@ -304,7 +304,6 @@ void nr_polar_rm_interleaving_cb(void *in, void *out, uint16_t E)
 static inline void polar_rate_matching(const t_nrPolar_params *polarParams,void *in,void *out) __attribute__((always_inline));

 static inline void polar_rate_matching(const t_nrPolar_params *polarParams,void *in,void *out) {
-  int i = 0;

  // handle rate matching with a single 128 bit word using bit shuffling
  // can be done with SIMD intrisics if needed
@@ -344,20 +343,15 @@ static inline void polar_rate_matching(const t_nrPolar_params *polarParams,void
  }					     
  // These are based on LUTs for byte and short word groups
  else if (polarParams->groupsize == 8)
-    for (i=0; i<polarParams->encoderLength>>3; i++) ((uint8_t *)out)[i] = ((uint8_t *)in)[polarParams->rm_tab[i]];
+    for (int i=0; i<polarParams->encoderLength>>3; i++) ((uint8_t *)out)[i] = ((uint8_t *)in)[polarParams->rm_tab[i]];
  else // groupsize==16
-    for (i=0; i<polarParams->encoderLength>>4; i++) {
+    for (int i=0; i<polarParams->encoderLength>>4; i++) {
      ((uint16_t *)out)[i] = ((uint16_t *)in)[polarParams->rm_tab[i]];
    }

  if (polarParams->i_bil == 1) {
    nr_polar_rm_interleaving_cb(out, out, polarParams->encoderLength);
  }
-  // handle remaining bits which do not fill a full group
-  for(i=i*polarParams->groupsize; i<polarParams->encoderLength; i++) {
-    uint8_t pi = polarParams->rate_matching_pattern[i];
-    ((uint8_t *)out)[i>>3] |= ( ((((uint8_t *)in)[pi >> 3] >> (pi & 7)) & 1) << (i&7));
-  }
 }

 void build_polar_tables(t_nrPolar_params *polarParams) {
@@ -454,8 +448,8 @@ void build_polar_tables(t_nrPolar_params *polarParams) {
  }
 #ifdef DEBUG_POLAR_ENCODER
  groupcnt++;
-#endif
-  //if ((ccnt+1)<mingroupsize) mingroupsize=ccnt+1;
+  #endif
+  if ((ccnt+1)<mingroupsize) mingroupsize=ccnt+1;
 #ifdef DEBUG_POLAR_ENCODER
  printf("group %d (size %d): (%d:%d) => (%d:%d)\n",groupcnt,ccnt+1,
             firstingroup_in,firstingroup_in+ccnt,
@@ -483,7 +477,8 @@ void build_polar_tables(t_nrPolar_params *polarParams) {
      break;
  }

-  polarParams->rm_tab=(int *)malloc(sizeof(int)*((polarParams->encoderLength+mingroupsize-1)/mingroupsize));
+  polarParams->rm_tab = (int *)malloc(sizeof(int) * (polarParams->encoderLength >> shift));
+
  // rerun again to create groups
  int tcnt = 0;
  for (int outpos = 0; outpos < polarParams->encoderLength; outpos += mingroupsize, tcnt++)
@@ -492,7 +487,6 @@ void build_polar_tables(t_nrPolar_params *polarParams) {

 void polar_encoder_fast(uint64_t *A,
                        void *out,
-                        uint32_t *crc,
                        int32_t crcmask,
                        uint8_t ones_flag,
                        int8_t messageType,
@@ -605,7 +599,7 @@ void polar_encoder_fast(uint64_t *A,
    else if (polarParams->crcParityBits == 11)
      tcrc = (uint64_t)((crcmask^(crc11(A128_flip,bitlen)>>21)))&0x7ff;
  }
-  if (crc) *crc = (uint32_t)tcrc;
+
  // this is number of quadwords in the bit string
  int quadwlen = (polarParams->K+63)/64;

@@ -713,12 +707,11 @@ void polar_encoder_fast(uint64_t *A,
  printf("\n");
 #endif

-  memset((void*)out,0,(polarParams->encoderLength + 7)>>3);
+  memset((void*)out,0,polarParams->encoderLength>>3);
  polar_rate_matching(polarParams,(void *)D, out);

 #ifdef POLAR_CODING_DEBUG
  uint64_t *out64 = (uint64_t *)out;
-  printf("N %d, encoderLength %d\n",polarParams->N,polarParams->encoderLength);
  printf("rm:");
  for (int n = 0; n < polarParams->encoderLength; n++) {
    if (n % 4 == 0) {
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_psbch_defs.h
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_psbch_defs.h
@@ -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
- */
-
-/*! \file /PHY/CODING/nrPolar_tools/nr_polar_psbch_defs.h
- \brief Polar definitions required for Sidelink PSBCH
- \author
- \date
- \version
- \company: Fraunhofer
- \email:
- \note
- \warning
-*/
-
-#ifndef __NR_POLAR_PSBCH_DEFS__H__
-#define __NR_POLAR_PSBCH_DEFS__H__
-
-//PSBCH related polar parameters.
-
-//PSBCH symbols sent in 11RBS, 9 symbols. 11*9*(12-3(for DMRS))*2bits = 1782 bits
-#define SL_NR_POLAR_PSBCH_E_NORMAL_CP 1782
-//PSBCH symbols sent in 11RBS, 7 symbols. 11*7*(12-3(for DMRS))*2bits = 1386 bits
-#define SL_NR_POLAR_PSBCH_E_EXT_CP 1386
-// SL_NR_POLAR_PSBCH_E_NORMAL_CP/32
-#define SL_NR_POLAR_PSBCH_E_DWORD 56
-
-#define SL_NR_POLAR_PSBCH_MESSAGE_TYPE (NR_POLAR_UCI_PUCCH_MESSAGE_TYPE + 1)
-#define SL_NR_POLAR_PSBCH_PAYLOAD_BITS 32
-#define SL_NR_POLAR_PSBCH_AGGREGATION_LEVEL 0
-#define SL_NR_POLAR_PSBCH_N_MAX 9
-#define SL_NR_POLAR_PSBCH_I_IL 1
-#define SL_NR_POLAR_PSBCH_I_SEG 0
-#define SL_NR_POLAR_PSBCH_N_PC 0
-#define SL_NR_POLAR_PSBCH_N_PC_WM 0
-#define SL_NR_POLAR_PSBCH_I_BIL 0
-#define SL_NR_POLAR_PSBCH_CRC_PARITY_BITS 24
-#define SL_NR_POLAR_PSBCH_CRC_ERROR_CORRECTION_BITS 3
-
-#endif
--- a/openair1/PHY/CODING/nr_polar_init.c
+++ b/openair1/PHY/CODING/nr_polar_init.c
@@ -32,7 +32,6 @@

 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 #include "PHY/NR_TRANSPORT/nr_dci.h"
-#include "nrPolar_tools/nr_polar_psbch_defs.h"

 #define PolarKey ((messageType<<24)|(messageLength<<8)|aggregation_level)
 static t_nrPolar_params * PolarList=NULL;
@@ -99,7 +98,7 @@ t_nrPolar_params *nr_polar_params(int8_t messageType, uint16_t messageLength, ui
  //Parse the list. If the node is already created, return without initialization.
  while (currentPtr != NULL) {
    //printf("currentPtr->idx %d, (%d,%d)\n",currentPtr->idx,currentPtr->payloadBits,currentPtr->encoderLength);
-    LOG_D(NR_PHY,"Looking for index %d\n",(messageType * messageLength * aggregation_level));
+    //LOG_D(PHY,"Looking for index %d\n",(messageType * messageLength * aggregation_prime));
    if (currentPtr->busy == false && currentPtr->idx == PolarKey ) {
      currentPtr->busy=true;
      pthread_mutex_unlock(&PolarListMutex);
@@ -114,11 +113,10 @@ t_nrPolar_params *nr_polar_params(int8_t messageType, uint16_t messageLength, ui
  //  printf("currentPtr %p (polarParams %p)\n",currentPtr,polarParams);
  //Else, initialize and add node to the end of the linked list.
  t_nrPolar_params *newPolarInitNode = calloc(sizeof(t_nrPolar_params),1);
+  AssertFatal(newPolarInitNode, "[nr_polar_init] New t_nrPolar_params * could not be created");
  newPolarInitNode->busy=true;
  pthread_mutex_unlock(&PolarListMutex);

-  AssertFatal(newPolarInitNode != NULL, "[nr_polar_init] New t_nrPolar_params * could not be created");
-  
  //   LOG_D(PHY,"Setting new polarParams index %d, messageType %d, messageLength %d, aggregation_prime %d\n",(messageType * messageLength * aggregation_prime),messageType,messageLength,aggregation_prime);
  newPolarInitNode->idx = PolarKey;
  newPolarInitNode->nextPtr = NULL;
@@ -195,39 +193,7 @@ t_nrPolar_params *nr_polar_params(int8_t messageType, uint16_t messageLength, ui
    newPolarInitNode->payloadBits = messageLength;
    newPolarInitNode->crcCorrectionBits = NR_POLAR_PUCCH_CRC_ERROR_CORRECTION_BITS;
    //LOG_D(PHY,"New polar node, encoderLength %d, aggregation_level %d\n",newPolarInitNode->encoderLength,aggregation_level);
-  } else if (messageType == SL_NR_POLAR_PSBCH_MESSAGE_TYPE) { //PSBCH
-    newPolarInitNode->n_max = SL_NR_POLAR_PSBCH_N_MAX;
-    newPolarInitNode->i_il = SL_NR_POLAR_PSBCH_I_IL;
-    newPolarInitNode->i_seg = SL_NR_POLAR_PSBCH_I_SEG;
-    newPolarInitNode->n_pc = SL_NR_POLAR_PSBCH_N_PC;
-    newPolarInitNode->n_pc_wm = SL_NR_POLAR_PSBCH_N_PC_WM;
-    newPolarInitNode->i_bil = SL_NR_POLAR_PSBCH_I_BIL;
-    newPolarInitNode->crcParityBits = SL_NR_POLAR_PSBCH_CRC_PARITY_BITS;
-    newPolarInitNode->payloadBits = SL_NR_POLAR_PSBCH_PAYLOAD_BITS;
-    newPolarInitNode->encoderLength = SL_NR_POLAR_PSBCH_E_NORMAL_CP;
-    newPolarInitNode->crcCorrectionBits = SL_NR_POLAR_PSBCH_CRC_ERROR_CORRECTION_BITS;
-    newPolarInitNode->crc_generator_matrix = crc24c_generator_matrix(newPolarInitNode->payloadBits);//G_P
-    LOG_D(PHY,"SIDELINK: Initializing polar parameters for PSBCH (K %d, E %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength);
-  } else if (messageType == NR_POLAR_DCI_MESSAGE_TYPE || messageType == NR_POLAR_SCI_MESSAGE_TYPE || messageType == NR_POLAR_SCI2_MESSAGE_TYPE) {
-    newPolarInitNode->n_max = NR_POLAR_DCI_N_MAX;
-    newPolarInitNode->i_il = NR_POLAR_DCI_I_IL;
-    newPolarInitNode->i_seg = NR_POLAR_DCI_I_SEG;
-    newPolarInitNode->n_pc = NR_POLAR_DCI_N_PC;
-    newPolarInitNode->n_pc_wm = NR_POLAR_DCI_N_PC_WM;
-    newPolarInitNode->i_bil = NR_POLAR_DCI_I_BIL;
-    newPolarInitNode->crcParityBits = NR_POLAR_DCI_CRC_PARITY_BITS;
-    newPolarInitNode->payloadBits = messageLength;
-    if (messageType == NR_POLAR_DCI_MESSAGE_TYPE)
-       newPolarInitNode->encoderLength = aggregation_level * 108;
-    else if (messageType == NR_POLAR_SCI_MESSAGE_TYPE)
-       newPolarInitNode->encoderLength = aggregation_level * 18; // for SCI1A aggregartion_level helds the number of PRBs, so multiply by 9*2 bits per PRB (9 REs with PSCCH payload)
-    else if (messageType == NR_POLAR_SCI2_MESSAGE_TYPE)
-       newPolarInitNode->encoderLength = aggregation_level * 2; // for SCI2 aggregartion_level helds the number of REs so multiple by 2, QPSK )
-    newPolarInitNode->crcCorrectionBits = NR_POLAR_DCI_CRC_ERROR_CORRECTION_BITS;
-    newPolarInitNode->crc_generator_matrix = crc24c_generator_matrix(newPolarInitNode->payloadBits + newPolarInitNode->crcParityBits); // G_P
-    //printf("Initializing polar parameters for DCI (K %d, E %d, L %d)\n",newPolarInitNode->payloadBits,newPolarInitNode->encoderLength,aggregation_level);

-  } else if (messageType == NR_POLAR_UCI_PUCCH_MESSAGE_TYPE) {
  } else {
    AssertFatal(1 == 0, "[nr_polar_init] Incorrect Message Type(%d)", messageType);
  }
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -572,7 +572,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB)

  nr_generate_modulation_table();
  gNB->pdcch_gold_init = cfg->cell_config.phy_cell_id.value;
-  nr_init_pdcch_dmrs(&gNB->frame_parms,gNB->nr_gold_pdcch_dmrs, cfg->cell_config.phy_cell_id.value);
+  nr_init_pdcch_dmrs(gNB, cfg->cell_config.phy_cell_id.value);
  nr_init_pbch_interleaver(gNB->nr_pbch_interleaver);

  //PDSCH DMRS init
--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -28,7 +28,6 @@
 #include "PHY/MODULATION/nr_modulation.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_ue.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
-#include "PHY/NR_TRANSPORT/nr_ulsch.h"
 #include "PHY/NR_REFSIG/pss_nr.h"
 #include "PHY/NR_REFSIG/ul_ref_seq_nr.h"
 #include "PHY/NR_REFSIG/refsig_defs_ue.h"
@@ -36,9 +35,6 @@
 #include "PHY/MODULATION/nr_modulation.h"
 #include "openair2/COMMON/prs_nr_paramdef.h"
 #include "SCHED_NR_UE/harq_nr.h"
-#include "PHY/NR_REFSIG/nr_mod_table.h"
-#include <math.h>
-#include <complex.h>

 void RCconfig_nrUE_prs(void *cfg)
 {
@@ -54,8 +50,10 @@ void RCconfig_nrUE_prs(void *cfg)
  if (gParamList.numelt > 0)
  {
    ue->prs_active_gNBs = *(gParamList.paramarray[j][PRS_ACTIVE_GNBS_IDX].uptr);
-  } else {
-    LOG_I(PHY,"%s configuration NOT found..!! Skipped configuring UE for the PRS reception\n", CONFIG_STRING_PRS_CONFIG);
+  }
+  else
+  {
+    LOG_E(PHY,"%s configuration NOT found..!! Skipped configuring UE for the PRS reception\n", CONFIG_STRING_PRS_CONFIG);
  }

  paramlist_def_t PRS_ParamList = {{0},NULL,0};
@@ -135,8 +133,10 @@ void RCconfig_nrUE_prs(void *cfg)
        LOG_I(PHY, "MutingPattern2 \t\t[%s\b\b]\n", str[6]);
        LOG_I(PHY, "-----------------------------------------\n");
      }
-    } else {
-      LOG_I(PHY,"No %s configuration found..!!\n", PRS_ParamList.listname);
+    }
+    else
+    {
+      LOG_E(PHY,"No %s configuration found..!!\n", PRS_ParamList.listname);
    }
  }
 }
@@ -299,13 +299,11 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)

  // init RX buffers
  common_vars->rxdata = malloc16(fp->nb_antennas_rx * sizeof(c16_t *));
-
-  int num_samples = 2 * fp->samples_per_frame + fp->ofdm_symbol_size;
-  if (ue->sl_mode == 2)
-    num_samples = (SL_NR_PSBCH_REPETITION_IN_FRAMES * fp->samples_per_frame) + fp->ofdm_symbol_size;
+  common_vars->rxdataF = malloc16(fp->nb_antennas_rx * sizeof(c16_t *));

  for (i=0; i<fp->nb_antennas_rx; i++) {
-    common_vars->rxdata[i] = malloc16_clear(num_samples * sizeof(c16_t));
+    common_vars->rxdata[i] = malloc16_clear((2 * (fp->samples_per_frame) + fp->ofdm_symbol_size) * sizeof(c16_t));
+    common_vars->rxdataF[i] = malloc16_clear((2 * (fp->samples_per_frame) + fp->ofdm_symbol_size) * sizeof(c16_t));
  }

  // ceil(((NB_RB<<1)*3)/32) // 3 RE *2(QPSK)
@@ -392,15 +390,6 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
  return 0;
 }

-static void sl_ue_free(PHY_VARS_NR_UE *UE) {
-
-  if (UE->SL_UE_PHY_PARAMS.init_params.sl_pss_for_correlation) {
-    free_and_zero(UE->SL_UE_PHY_PARAMS.init_params.sl_pss_for_correlation[0]);
-    free_and_zero(UE->SL_UE_PHY_PARAMS.init_params.sl_pss_for_correlation[1]);
-    free_and_zero(UE->SL_UE_PHY_PARAMS.init_params.sl_pss_for_correlation);
-  }
-}
-
 void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
 {
  const NR_DL_FRAME_PARMS* fp = &ue->frame_parms;
@@ -426,8 +415,10 @@ void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)

  for (int i = 0; i < fp->nb_antennas_rx; i++) {
    free_and_zero(common_vars->rxdata[i]);
+    free_and_zero(common_vars->rxdataF[i]);
  }
  free_and_zero(common_vars->rxdata);
+  free_and_zero(common_vars->rxdataF);

  for (int slot = 0; slot < fp->slots_per_frame; slot++) {
    for (int symb = 0; symb < fp->symbols_per_slot; symb++)
@@ -506,8 +497,6 @@ void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)

    free_and_zero(ue->prs_vars[idx]);
  }
-
-  sl_ue_free(ue);
 }

 void free_nr_ue_dl_harq(NR_DL_UE_HARQ_t harq_list[2][NR_MAX_DLSCH_HARQ_PROCESSES], int number_of_processes, int num_rb) {
@@ -559,10 +548,8 @@ void term_nr_ue_transport(PHY_VARS_NR_UE *ue)
 {
  const int N_RB_DL = ue->frame_parms.N_RB_DL;
  const int N_RB_UL = ue->frame_parms.N_RB_UL;
-  const int N_RB_SL = ue->SL_UE_PHY_PARAMS.sl_frame_params.N_RB_SL;
  free_nr_ue_dl_harq(ue->dl_harq_processes, NR_MAX_DLSCH_HARQ_PROCESSES, N_RB_DL);
  free_nr_ue_ul_harq(ue->ul_harq_processes, NR_MAX_ULSCH_HARQ_PROCESSES, N_RB_UL, ue->frame_parms.nb_antennas_tx);
-  free_nr_ue_ul_harq(ue->sl_harq_processes, NR_MAX_SLSCH_HARQ_PROCESSES, N_RB_SL, ue->SL_UE_PHY_PARAMS.sl_frame_params.nb_antennas_tx);
 }

 void nr_init_dl_harq_processes(NR_DL_UE_HARQ_t harq_list[2][NR_MAX_DLSCH_HARQ_PROCESSES], int number_of_processes, int num_rb) {
@@ -645,7 +632,6 @@ void init_nr_ue_transport(PHY_VARS_NR_UE *ue) {

  nr_init_dl_harq_processes(ue->dl_harq_processes, NR_MAX_DLSCH_HARQ_PROCESSES, ue->frame_parms.N_RB_DL);
  nr_init_ul_harq_processes(ue->ul_harq_processes, NR_MAX_ULSCH_HARQ_PROCESSES, ue->frame_parms.N_RB_UL, ue->frame_parms.nb_antennas_tx);
-  nr_init_ul_harq_processes(ue->sl_harq_processes, NR_MAX_SLSCH_HARQ_PROCESSES, ue->SL_UE_PHY_PARAMS.sl_frame_params.N_RB_SL, ue->frame_parms.nb_antennas_tx);

  for(int i=0; i<5; i++)
    ue->dl_stats[i] = 0;
@@ -656,8 +642,7 @@ void init_N_TA_offset(PHY_VARS_NR_UE *ue){

  NR_DL_FRAME_PARMS *fp = &ue->frame_parms;

-  // No timing offset for Sidelink, refer to 3GPP 38.211 Section 8.5
-  if (fp->frame_type == FDD || ue->sl_mode == 2) {
+  if (fp->frame_type == FDD) {
    ue->N_TA_offset = 0;
  } else {
    int N_TA_offset = fp->ul_CarrierFreq < 6e9 ? 400 : 431; // reference samples  for 25600Tc @ 30.72 Ms/s for FR1, same @ 61.44 Ms/s for FR2
@@ -709,364 +694,3 @@ void phy_term_nr_top(void)
  free_ul_reference_signal_sequences();
  free_context_synchro_nr();
 }
-
-static void sl_init_psbch_dmrs_gold_sequences(PHY_VARS_NR_UE *UE)
-{
-  unsigned int x1, x2;
-  uint16_t slss_id;
-  uint8_t reset;
-
-  for (slss_id = 0; slss_id < SL_NR_NUM_SLSS_IDs; slss_id++) {
-
-    reset = 1;
-    x2 = slss_id;
-
-#ifdef SL_DEBUG_INIT
-     printf("\nPSBCH DMRS GOLD SEQ for SLSSID :%d  :\n", slss_id);
-#endif
-
-    for (uint8_t n=0; n<SL_NR_NUM_PSBCH_DMRS_RE_DWORD; n++) {
-      UE->SL_UE_PHY_PARAMS.init_params.psbch_dmrs_gold_sequences[slss_id][n] = lte_gold_generic(&x1, &x2, reset);
-      reset = 0;
-
-#ifdef SL_DEBUG_INIT_DATA
-      printf("%x\n",SL_UE_INIT_PARAMS.sl_psbch_dmrs_gold_sequences[slss_id][n]);
-#endif
-
-    }
-  }
-}
-
-
-static void sl_generate_psbch_dmrs_qpsk_sequences(PHY_VARS_NR_UE *UE,
-                                                  struct complex16 *modulated_dmrs_sym,
-                                                  uint16_t slss_id) {
-
-  uint8_t idx = 0;
-  uint32_t *sl_dmrs_sequence = UE->SL_UE_PHY_PARAMS.init_params.psbch_dmrs_gold_sequences[slss_id];
-
-#ifdef SL_DEBUG_INIT
-  printf("SIDELINK INIT: PSBCH DMRS Generation with slss_id:%d\n", slss_id);
-#endif
-
-  /// QPSK modulation
-  for (int m=0; m<SL_NR_NUM_PSBCH_DMRS_RE; m++) {
-
-    idx = (((sl_dmrs_sequence[(m<<1)>>5])>>((m<<1)&0x1f))&3);
-    modulated_dmrs_sym[m].r = nr_qpsk_mod_table[2*idx];
-    modulated_dmrs_sym[m].i = nr_qpsk_mod_table[(2*idx) + 1];
-
-#ifdef SL_DEBUG_INIT_DATA
-    printf("m:%d gold seq: %d b0-b1: %d-%d DMRS Symbols: %d %d\n", m, sl_dmrs_sequence[(m<<1)>>5], (((sl_dmrs_sequence[(m<<1)>>5])>>((m<<1)&0x1f))&1),
-           (((sl_dmrs_sequence[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1), modulated_dmrs_sym[m].r, modulated_dmrs_sym[m].i);
-    printf("idx:%d, qpsk_table.r:%d, qpsk_table.i:%d\n", idx, nr_qpsk_mod_table[2*idx], nr_qpsk_mod_table[(2*idx) + 1]);
-#endif
-  }
-
-#ifdef SL_DUMP_INIT_SAMPLES
-  char filename[40], varname[25];
-  sprintf(filename,"sl_psbch_dmrs_slssid_%d.m", slss_id);
-  sprintf(varname,"sl_dmrs_id_%d.m", slss_id);
-  LOG_M(filename, varname, (void*)modulated_dmrs_sym, SL_NR_NUM_PSBCH_DMRS_RE, 1, 1);
-#endif
-
-}
-
-
-static void sl_generate_pss(SL_NR_UE_INIT_PARAMS_t *sl_init_params, uint8_t n_sl_id2, uint16_t scaling) {
-
-  int i = 0, m = 0;
-  int16_t x[SL_NR_PSS_SEQUENCE_LENGTH];
-  const int x_initial[7] = {0, 1, 1 , 0, 1, 1, 1};
-  int16_t *sl_pss = sl_init_params->sl_pss[n_sl_id2];
-  int16_t *sl_pss_for_sync = sl_init_params->sl_pss_for_sync[n_sl_id2];
-
-  LOG_D(PHY, "SIDELINK PSBCH INIT: PSS Generation with N_SL_id2:%d\n", n_sl_id2);
-
-#ifdef SL_DEBUG_INIT
-  printf("SIDELINK: PSS Generation with N_SL_id2:%d\n", n_sl_id2);
-#endif
-
-  /// Sequence generation
-  for (i=0; i < 7; i++)
-    x[i] = x_initial[i];
-
-  for (i=0; i < (SL_NR_PSS_SEQUENCE_LENGTH - 7); i++) {
-    x[i+7] = (x[i + 4] + x[i]) %2;
-  }
-
-  for (i=0; i < SL_NR_PSS_SEQUENCE_LENGTH; i++) {
-    m = (i + 22 + 43*n_sl_id2) % SL_NR_PSS_SEQUENCE_LENGTH;
-    sl_pss_for_sync[i] = (1 - 2*x[m]);
-    sl_pss[i] = sl_pss_for_sync[i] * scaling;
-
-#ifdef SL_DEBUG_INIT_DATA
-  printf("m:%d, sl_pss[%d]:%d\n", m, i, sl_pss[i]);
-#endif
-
-  }
-
-#ifdef SL_DUMP_INIT_SAMPLES
-  LOG_M("sl_pss_seq.m", "sl_pss", (void*)sl_pss, SL_NR_PSS_SEQUENCE_LENGTH, 1, 0);
-#endif
-
-
-
-}
-
-static void sl_generate_sss(SL_NR_UE_INIT_PARAMS_t *sl_init_params, uint16_t slss_id, uint16_t scaling) {
-
-  int i = 0;
-  int m0, m1;
-  int n_sl_id1, n_sl_id2;
-  int16_t *sl_sss = sl_init_params->sl_sss[slss_id];
-  int16_t *sl_sss_for_sync = sl_init_params->sl_sss_for_sync[slss_id];
-
-  int16_t x0[SL_NR_SSS_SEQUENCE_LENGTH], x1[SL_NR_SSS_SEQUENCE_LENGTH];
-  const int x_initial[7] = { 1, 0, 0, 0, 0, 0, 0 };
-
-  n_sl_id1 = slss_id % 336;
-  n_sl_id2 = slss_id / 336;
-
-  LOG_D(PHY, "SIDELINK INIT: SSS Generation with N_SL_id1:%d N_SL_id2:%d\n", n_sl_id1, n_sl_id2);
-
-#ifdef SL_DEBUG_INIT
-  printf("SIDELINK: SSS Generation with slss_id:%d, N_SL_id1:%d, N_SL_id2:%d\n", slss_id, n_sl_id1, n_sl_id2);
-#endif
-
-  for ( i=0 ; i < 7 ; i++) {
-    x0[i] = x_initial[i];
-    x1[i] = x_initial[i];
-  }
-
-  for ( i=0 ; i < SL_NR_SSS_SEQUENCE_LENGTH - 7 ; i++) {
-    x0[i+7] = (x0[i + 4] + x0[i]) % 2;
-    x1[i+7] = (x1[i + 1] + x1[i]) % 2;
-  }
-
-  m0 = 15*(n_sl_id1/112) + (5*n_sl_id2);
-  m1 = n_sl_id1 % 112;
-
-  for (i = 0; i < SL_NR_SSS_SEQUENCE_LENGTH ; i++) {
-    sl_sss_for_sync[i] = (1 - 2*x0[(i + m0) % SL_NR_SSS_SEQUENCE_LENGTH] ) * (1 - 2*x1[(i + m1) % SL_NR_SSS_SEQUENCE_LENGTH] );
-    sl_sss[i] = sl_sss_for_sync[i] * scaling;
-
-#ifdef SL_DEBUG_INIT_DATA
-  printf("m0:%d, m1:%d, sl_sss_for_sync[%d]:%d, sl_sss[%d]:%d\n", m0, m1, i, sl_sss_for_sync[i], i, sl_sss[i]);
-#endif
-
-  }
-
-#ifdef SL_DUMP_PSBCH_TX_SAMPLES
-  LOG_M("sl_sss_seq.m", "sl_sss", (void*)sl_sss, SL_NR_SSS_SEQUENCE_LENGTH, 1, 0);
-  LOG_M("sl_sss_forsync_seq.m", "sl_sss_for_sync", (void*)sl_sss_for_sync, SL_NR_SSS_SEQUENCE_LENGTH, 1, 0);
-#endif
-
-}
-
-// This cannot be done at init time as ofdm symbol size, ssb start subcarrier depends on configuration
-// done at SLSS read time.
-static void sl_generate_pss_ifft_samples(sl_nr_ue_phy_params_t *sl_ue_params, SL_NR_UE_INIT_PARAMS_t *sl_init_params) {
-
-  uint8_t id2 = 0;
-  int16_t *sl_pss = NULL;
-  NR_DL_FRAME_PARMS *sl_fp = &sl_ue_params->sl_frame_params;
-  int16_t scaling_factor = AMP;
-
-  int16_t *pss_F = NULL; // IQ samples in freq domain
-  int32_t *pss_T = NULL;
-
-  uint16_t k = 0;
-
-  pss_F = malloc16_clear(2*sizeof(int16_t) * sl_fp->ofdm_symbol_size);
-
-  LOG_I(PHY, "SIDELINK INIT: Generation of PSS time domain samples. scaling_factor:%d\n", scaling_factor);
-
-  for (id2 = 0; id2 < SL_NR_NUM_IDs_IN_PSS; id2++) {
-
-    k = sl_fp->first_carrier_offset + sl_fp->ssb_start_subcarrier + 2; // PSS in from REs 2-129
-    if (k >= sl_fp->ofdm_symbol_size) k -= sl_fp->ofdm_symbol_size;
-
-    pss_T = &sl_init_params->sl_pss_for_correlation[id2][0];
-    sl_pss = sl_init_params->sl_pss[id2];
-
-    memset(pss_T, 0, sl_fp->ofdm_symbol_size * sizeof(pss_T[0]));
-    memset(pss_F, 0, sl_fp->ofdm_symbol_size * 2 * sizeof(pss_F[0]));
-
-    for (int i=0; i < SL_NR_PSS_SEQUENCE_LENGTH; i++) {
-
-      pss_F[2*k] = (sl_pss[i] * scaling_factor) >> 15;
-      //pss_F[2*k] = (sl_pss[i]/23170) * 4192;
-      //pss_F[2*k+1] = 0;
-
-#ifdef SL_DEBUG_INIT_DATA
-      printf("id:%d, k:%d, pss_F[%d]:%d, sl_pss[%d]:%d\n", id2, k, 2*k, pss_F[2*k], i, sl_pss[i]);
-#endif
-
-      k++;
-      if (k == sl_fp->ofdm_symbol_size) k=0;
-
-    }
-
-      idft((int16_t)get_idft(sl_fp->ofdm_symbol_size),
-                  pss_F,          /* complex input */
-                  (int16_t *)&pss_T[0],  /* complex output */
-                  1);                 /* scaling factor */
-
-  }
-
-#ifdef SL_DUMP_PSBCH_TX_SAMPLES
-  LOG_M("sl_pss_TD_id0.m", "pss_TD_0", (void*)sl_init_params->sl_pss_for_correlation[0], sl_fp->ofdm_symbol_size, 1, 1);
-  LOG_M("sl_pss_TD_id1.m", "pss_TD_1", (void*)sl_init_params->sl_pss_for_correlation[1], sl_fp->ofdm_symbol_size, 1, 1);
-#endif
-
-  free(pss_F);
-
-}
-
-void init_ul_delay_table(NR_DL_FRAME_PARMS *fp)
-{
-  for (int delay = -MAX_UL_DELAY_COMP; delay <= MAX_UL_DELAY_COMP; delay++) {
-    for (int k = 0; k < fp->ofdm_symbol_size; k++) {
-      double complex delay_cexp = cexp(I * (2.0 * M_PI * k * delay / fp->ofdm_symbol_size));
-      fp->ul_delay_table[MAX_UL_DELAY_COMP + delay][k].r = (int16_t)round(256 * creal(delay_cexp));
-      fp->ul_delay_table[MAX_UL_DELAY_COMP + delay][k].i = (int16_t)round(256 * cimag(delay_cexp));
-    }
-  }
-}
-
-
-void sl_ue_phy_init(PHY_VARS_NR_UE *UE) {
-
-  uint16_t scaling_value = ONE_OVER_SQRT2_Q15;
-
-  NR_DL_FRAME_PARMS *sl_fp = &UE->SL_UE_PHY_PARAMS.sl_frame_params;
-
-  if (!UE->SL_UE_PHY_PARAMS.init_params.sl_pss_for_correlation) {
-    UE->SL_UE_PHY_PARAMS.init_params.sl_pss_for_correlation = (int32_t **)malloc16_clear(SL_NR_NUM_IDs_IN_PSS *sizeof(int32_t *) );
-    UE->SL_UE_PHY_PARAMS.init_params.sl_pss_for_correlation[0] = (int32_t *)malloc16_clear( sizeof(int32_t)*sl_fp->ofdm_symbol_size);
-    UE->SL_UE_PHY_PARAMS.init_params.sl_pss_for_correlation[1] = (int32_t *)malloc16_clear( sizeof(int32_t)*sl_fp->ofdm_symbol_size);
-  }
-  LOG_I(PHY, "SIDELINK INIT: GENERATE PSS, SSS, GOLD SEQUENCES AND PSBCH DMRS SEQUENCES FOR ALL possible SLSS IDs 0- 671\n");
-
-  // Generate PSS sequences for IDs 0,1 used in PSS
-  sl_generate_pss(&UE->SL_UE_PHY_PARAMS.init_params,0, scaling_value);
-  sl_generate_pss(&UE->SL_UE_PHY_PARAMS.init_params,1, scaling_value);
-
-  // Generate psbch dmrs Gold Sequences and modulated dmrs symbols
-  sl_init_psbch_dmrs_gold_sequences(UE);
-  // Generate pscch dmrs Gold Sequences
-  UE->nr_gold_pscch_dmrs = (uint32_t ***)malloc16(sl_fp->slots_per_frame*sizeof(uint32_t **));
-  uint32_t ***pscch_dmrs             = UE->nr_gold_pscch_dmrs;
-  AssertFatal(pscch_dmrs!=NULL, "NR init: pscch_dmrs malloc failed\n");
-  int pscch_dmrs_init_length =  (((sl_fp->N_RB_UL<<1)*3)>>5)+1;
-
-  for (int slot=0; slot<sl_fp->slots_per_frame; slot++) {
-    pscch_dmrs[slot] = (uint32_t **)malloc16(sl_fp->symbols_per_slot*sizeof(uint32_t *));
-    AssertFatal(pscch_dmrs[slot]!=NULL, "NR SL UE init: pscch_dmrs for slot %d - malloc failed\n", slot);
-
-    for (int symb=0; symb<sl_fp->symbols_per_slot; symb++) {
-      pscch_dmrs[slot][symb] = (uint32_t *)malloc16(pscch_dmrs_init_length*sizeof(uint32_t));
-      LOG_D(PHY,"pscch_dmrs[%d][%d] %p\n",slot,symb,pscch_dmrs[slot][symb]);
-      AssertFatal(pscch_dmrs[slot][symb]!=NULL, "NR SL UE init: pscch_dmrs for slot %d symbol %d - malloc failed\n", slot, symb);
-    }
-  }
-
-  nr_init_pdcch_dmrs(sl_fp,UE->nr_gold_pscch_dmrs, UE->SL_UE_PHY_PARAMS.sl_config.sl_DMRS_ScrambleId);
-
-  // PSCCH DMRS RX
-  UE->nr_gold_pscch = malloc16(sl_fp->slots_per_frame * sizeof(uint32_t **));
-  uint32_t ***pscch_dmrs_rx = UE->nr_gold_pscch;
-  AssertFatal(pscch_dmrs_rx!=NULL, "NR init: pscch_dmrs malloc failed\n");
-
-  for (int slot=0; slot<sl_fp->slots_per_frame; slot++) {
-    pscch_dmrs_rx[slot] = malloc16(sl_fp->symbols_per_slot * sizeof(uint32_t *));
-    AssertFatal(pscch_dmrs_rx[slot]!=NULL, "NR init: pscch_dmrs for slot %d - malloc failed\n", slot);
-
-    for (int symb=0; symb<sl_fp->symbols_per_slot; symb++) {
-      pscch_dmrs_rx[slot][symb] = malloc16(pscch_dmrs_init_length * sizeof(uint32_t));
-      AssertFatal(pscch_dmrs[slot][symb]!=NULL, "NR init: pscch_dmrs for slot %d symbol %d - malloc failed\n", slot, symb);
-    }
-  }
-
-  nr_gold_pdcch(sl_fp, pscch_dmrs_rx,UE->SL_UE_PHY_PARAMS.sl_config.sl_DMRS_ScrambleId);
-
-  // SSS
-  for (int slss_id = 0; slss_id < SL_NR_NUM_SLSS_IDs; slss_id++) {
-    sl_generate_psbch_dmrs_qpsk_sequences(UE, UE->SL_UE_PHY_PARAMS.init_params.psbch_dmrs_modsym[slss_id], slss_id);
-    sl_generate_sss(&UE->SL_UE_PHY_PARAMS.init_params, slss_id, scaling_value);
-  }
-
-  // Generate PSS time domain samples used for correlation during SLSS reception.
-  sl_generate_pss_ifft_samples(&UE->SL_UE_PHY_PARAMS, &UE->SL_UE_PHY_PARAMS.init_params);
-
-
-  UE->max_nb_slsch = NR_SLSCH_RX_MAX;
-  UE->slsch = (NR_gNB_ULSCH_t *)malloc16(UE->max_nb_slsch * sizeof(NR_gNB_ULSCH_t));
-  for (int i = 0; i < UE->max_nb_slsch; i++) {
-    LOG_I(PHY, "Allocating Transport Channel Buffers for SLSCH %d/%d\n", i, UE->max_nb_slsch);
-    UE->slsch[i] = new_gNB_ulsch(UE->max_ldpc_iterations, sl_fp->N_RB_UL);
-  }
-
-  int Prx=sl_fp->nb_antennas_rx;
-  int N_RB_UL = sl_fp->N_RB_UL;
-  int n_buf = 2*Prx;
-
-  int nb_re_pusch = N_RB_UL * NR_NB_SC_PER_RB;
-  int nb_re_pusch2 = nb_re_pusch + (nb_re_pusch&7);
-  UE->pssch_thres = 10;
-  UE->pssch_vars = (NR_gNB_PUSCH *)malloc16_clear(UE->max_nb_slsch * sizeof(NR_gNB_PUSCH));
-  for (int SLSCH_id = 0; SLSCH_id < NR_SLSCH_RX_MAX; SLSCH_id++) {
-    NR_gNB_PUSCH *pssch = &UE->pssch_vars[SLSCH_id];
-    pssch->rxdataF_ext = (int32_t **)malloc16(Prx * sizeof(int32_t *));
-    pssch->ul_ch_estimates = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ul_ch_estimates_ext = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ptrs_phase_per_slot = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ul_ch_estimates_time = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->rxdataF_comp = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ul_ch_mag0 = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ul_ch_magb0 = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ul_ch_magc0 = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ul_ch_mag = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ul_ch_magb = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->ul_ch_magc = (int32_t **)malloc16(n_buf * sizeof(int32_t *));
-    pssch->rho = (int32_t ***)malloc16(Prx * sizeof(int32_t **));
-    pssch->llr_layers = (int16_t **)malloc16(2 * sizeof(int32_t *));
-    for (int i = 0; i < Prx; i++) {
-      pssch->rxdataF_ext[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-      pssch->rho[i] = (int32_t **)malloc16_clear(2 * 2 * sizeof(int32_t *));
-
-      for (int j = 0; j < 2; j++) {
-        for (int k = 0; k < 2; k++) {
-          pssch->rho[i][j * 2 + k] =
-              (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-        }
-      }
-    }
-    for (int i = 0; i < n_buf; i++) {
-      pssch->ul_ch_estimates[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * sl_fp->ofdm_symbol_size * sl_fp->symbols_per_slot);
-      pssch->ul_ch_estimates_ext[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-      pssch->ul_ch_estimates_time[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * sl_fp->ofdm_symbol_size);
-      pssch->ptrs_phase_per_slot[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * sl_fp->symbols_per_slot); // symbols per slot
-      pssch->rxdataF_comp[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-      pssch->ul_ch_mag0[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-      pssch->ul_ch_magb0[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-      pssch->ul_ch_magc0[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-      pssch->ul_ch_mag[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-      pssch->ul_ch_magb[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-      pssch->ul_ch_magc[i] = (int32_t *)malloc16_clear(sizeof(int32_t) * nb_re_pusch2 * sl_fp->symbols_per_slot);
-    }
-
-    for (int i=0; i< 2; i++) {
-      pssch->llr_layers[i] = (int16_t *)malloc16_clear((8 * ((3 * 8 * 6144) + 12))
-                                                       * sizeof(int16_t)); // [hna] 6144 is LTE and (8*((3*8*6144)+12)) is not clear
-    }
-    pssch->llr = (int16_t *)malloc16_clear((8 * ((3 * 8 * 6144) + 12))
-                                           * sizeof(int16_t)); // [hna] 6144 is LTE and (8*((3*8*6144)+12)) is not clear
-    pssch->ul_valid_re_per_slot = (int16_t *)malloc16_clear(sizeof(int16_t) * sl_fp->symbols_per_slot);
-  } // ulsch_id
-  UE->sl_measurements = calloc(1,sizeof(struct PHY_MEASUREMENTS_gNB_s));
-
-
-  init_ul_delay_table(sl_fp);
-}
--- a/openair1/PHY/INIT/nr_parms.c
+++ b/openair1/PHY/INIT/nr_parms.c
@@ -23,7 +23,6 @@
 #include "common/utils/nr/nr_common.h"
 #include "common/utils/LOG/log.h"
 #include "executables/softmodem-common.h"
-#include "PHY/MODULATION/nr_modulation.h"

 /// Subcarrier spacings in Hz indexed by numerology index
 static const uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3, 30e3, 60e3, 120e3, 240e3};
@@ -43,6 +42,18 @@ static const int nr_ssb_table[48][3] = {
    {93, 15, nr_ssb_type_A}, {94, 15, nr_ssb_type_A}, {96, 30, nr_ssb_type_C}};

 void set_Lmax(NR_DL_FRAME_PARMS *fp) {
+  if (get_softmodem_params()->sl_mode == 2) {
+    int sl_NumSSB_WithinPeriod = 1; //TODO: Needs to be updated from RRC parameters
+    int sl_TimeOffsetSSB = 1; //TODO: Needs to be updated from RRC parameters
+    int sl_TimeInterval = 1; //TODO: Needs to be updated from RRC parameters
+    if ((sl_NumSSB_WithinPeriod == 4) && ((sl_TimeOffsetSSB % fp->slots_per_frame) + 3 * sl_TimeInterval < NR_NUMBER_OF_SUBFRAMES_PER_FRAME * 2))
+      fp->Lmax = 4;
+    else if ((sl_NumSSB_WithinPeriod == 2) && ((sl_TimeOffsetSSB % fp->slots_per_frame) + sl_TimeInterval < NR_NUMBER_OF_SUBFRAMES_PER_FRAME))
+      fp->Lmax = 2;
+    else
+      fp->Lmax = 1;
+    return;
+  }
  // definition of Lmax according to ts 38.213 section 4.1
  if (fp->dl_CarrierFreq < 6e9) {
    if(fp->frame_type && (fp->ssb_type==2))
@@ -104,27 +115,23 @@ void set_scs_parameters (NR_DL_FRAME_PARMS *fp, int mu, int N_RB_DL)
    case NR_MU_0: //15kHz scs
      fp->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_0];
      fp->slots_per_subframe = nr_slots_per_subframe[NR_MU_0];
-      if (fp->nr_band != 47) {
-        fp->ssb_type = nr_ssb_type_A;
-        while(nr_ssb_table[idx][0]!=fp->nr_band)
-          idx++;
-        AssertFatal(nr_ssb_table[idx][1]==15,"SCS %d not applicable to band %d\n",
-                    fp->subcarrier_spacing,fp->nr_band);
-      }
+      fp->ssb_type = nr_ssb_type_A;
+      while(nr_ssb_table[idx][0]!=fp->nr_band)
+        idx++;
+      AssertFatal(nr_ssb_table[idx][1]==15,"SCS %d not applicable to band %d\n",
+                  fp->subcarrier_spacing,fp->nr_band);
      break;

    case NR_MU_1: //30kHz scs
      fp->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_1];
      fp->slots_per_subframe = nr_slots_per_subframe[NR_MU_1];
-      if (fp->nr_band != 47) {
-        while(nr_ssb_table[idx][0]!=fp->nr_band ||
-              nr_ssb_table[idx][1]!=30) {
-          AssertFatal(nr_ssb_table[idx][0]<=fp->nr_band,"SCS %d not applicable to band %d\n",
-                      fp->subcarrier_spacing,fp->nr_band);
-          idx++;
-        }
-        fp->ssb_type = nr_ssb_table[idx][2];
+       while(nr_ssb_table[idx][0]!=fp->nr_band ||
+             nr_ssb_table[idx][1]!=30) {
+        AssertFatal(nr_ssb_table[idx][0]<=fp->nr_band,"SCS %d not applicable to band %d\n",
+                    fp->subcarrier_spacing,fp->nr_band);
+        idx++;
      }
+      fp->ssb_type = nr_ssb_table[idx][2];
      break;

    case NR_MU_2: //60kHz scs
@@ -157,6 +164,9 @@ void set_scs_parameters (NR_DL_FRAME_PARMS *fp, int mu, int N_RB_DL)
    fp->ofdm_symbol_size <<= 1;

  fp->first_carrier_offset = fp->ofdm_symbol_size - (N_RB_DL * 12 / 2);
+  // TODO: Temporarily setting fp->first_carrier_offset = 0 for SL until MAC is developed
+  if (get_softmodem_params()->sl_mode == 2)
+    fp->first_carrier_offset = 0;
  fp->nb_prefix_samples    = fp->ofdm_symbol_size / 128 * 9;
  fp->nb_prefix_samples0   = fp->ofdm_symbol_size / 128 * (9 + (1 << mu));
  LOG_W(PHY,"Init: N_RB_DL %d, first_carrier_offset %d, nb_prefix_samples %d,nb_prefix_samples0 %d, ofdm_symbol_size %d\n",
@@ -170,7 +180,7 @@ uint32_t get_samples_per_slot(int slot, const NR_DL_FRAME_PARMS *fp)
  if(fp->numerology_index == 0)
    samp_count = fp->samples_per_subframe;
  else
-    samp_count = (slot % (fp->slots_per_subframe / 2)) ? fp->samples_per_slotN0 : fp->samples_per_slot0;
+    samp_count = (slot%(fp->slots_per_subframe/2)) ? fp->samples_per_slotN0 : fp->samples_per_slot0;

  return samp_count;
 }
@@ -289,6 +299,11 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
  LOG_D(PHY,"dl_bw_kHz %lu\n",dl_bw_khz);
  LOG_D(PHY,"dl_CarrierFreq %lu\n",fp->dl_CarrierFreq);

+  if (get_softmodem_params()->sl_mode == 2) {
+    uint64_t sl_bw_khz = (12 * config->carrier_config.sl_grid_size[config->ssb_config.scs_common]) * (15 << config->ssb_config.scs_common);
+    fp->sl_CarrierFreq = ((sl_bw_khz >> 1) + config->carrier_config.sl_frequency) * 1000;
+  }
+
  uint64_t ul_bw_khz = (12*config->carrier_config.ul_grid_size[config->ssb_config.scs_common])*(15<<config->ssb_config.scs_common);
  fp->ul_CarrierFreq = ((ul_bw_khz>>1) + config->carrier_config.uplink_frequency)*1000 ;

@@ -314,7 +329,7 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
    AssertFatal(fp->numerology_index == NR_MU_2,"Invalid cyclic prefix %d for numerology index %d\n", Ncp, fp->numerology_index);

  fp->Ncp = Ncp;
-  int N_RB = fp->N_RB_DL;
+  int N_RB = (get_softmodem_params()->sl_mode == 2) ? fp->N_RB_SL : fp->N_RB_DL;
  set_scs_parameters(fp, fp->numerology_index, N_RB);

  fp->slots_per_frame = 10* fp->slots_per_subframe;
@@ -339,6 +354,10 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
  }

  fp->ssb_start_subcarrier = (12 * config->ssb_table.ssb_offset_point_a + sco);
+  // TODO: Temporarily setting fp->ssb_start_subcarrier = 0 for SL until MAC is developed
+  if (get_softmodem_params()->sl_mode == 2) {
+      fp->ssb_start_subcarrier = 0;
+  }
  set_Lmax(fp);

  fp->L_ssb = (((uint64_t) config->ssb_table.ssb_mask_list[0].ssb_mask)<<32) | config->ssb_table.ssb_mask_list[1].ssb_mask;
@@ -388,6 +407,12 @@ void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink

 }

+void nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *frame_parms, uint64_t sidelink_frequency, uint16_t nr_band) {
+  LOG_D(NR_PHY, "SL init parameters. SL freq %lu\n", sidelink_frequency);
+  frame_parms->sl_CarrierFreq = sidelink_frequency;
+  frame_parms->nr_band = nr_band;
+}
+
 void nr_dump_frame_parms(NR_DL_FRAME_PARMS *fp)
 {
  LOG_I(PHY,"fp->scs=%d\n",fp->subcarrier_spacing);
@@ -401,109 +426,7 @@ void nr_dump_frame_parms(NR_DL_FRAME_PARMS *fp)
  LOG_I(PHY,"fp->samples_per_frame=%d\n",fp->samples_per_frame);
  LOG_I(PHY,"fp->dl_CarrierFreq=%lu\n",fp->dl_CarrierFreq);
  LOG_I(PHY,"fp->ul_CarrierFreq=%lu\n",fp->ul_CarrierFreq);
-  LOG_I(PHY,"fp->Nid_cell=%d\n",fp->Nid_cell);
-  LOG_I(PHY,"fp->first_carrier_offset=%d\n",fp->first_carrier_offset);
-  LOG_I(PHY,"fp->ssb_start_subcarrier=%d\n",fp->ssb_start_subcarrier);
-  LOG_I(PHY,"fp->Ncp=%d\n",fp->Ncp);
-  LOG_I(PHY,"fp->N_RB_DL=%d\n",fp->N_RB_DL);
-  LOG_I(PHY,"fp->numerology_index=%d\n",fp->numerology_index);
-  LOG_I(PHY,"fp->nr_band=%d\n",fp->nr_band);
-  LOG_I(PHY,"fp->ofdm_offset_divisor=%d\n",fp->ofdm_offset_divisor);
-  LOG_I(PHY,"fp->threequarter_fs=%d\n",fp->threequarter_fs);
-  LOG_I(PHY,"fp->sl_CarrierFreq=%lu\n",fp->sl_CarrierFreq);
-  LOG_I(PHY,"fp->N_RB_SL=%d\n",fp->N_RB_SL);
 }

-int nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *fp,
-                              sl_nr_phy_config_request_t* config,
-                              int threequarter_fs,
-                              uint32_t ofdm_offset_divisor)
-{
-
-  //Set also these parameters here instead of some where else.
-  fp->ofdm_offset_divisor = ofdm_offset_divisor;
-  fp->threequarter_fs = threequarter_fs;
-
-  fp->nr_band = get_band(config->sl_carrier_config.sl_frequency*1000, 0);
-
-  fp->att_rx = config->sl_carrier_config.sl_num_rx_ant;
-  fp->att_tx = config->sl_carrier_config.sl_num_tx_ant;
-  fp->nb_antennas_rx = fp->att_rx;
-  fp->nb_antennas_tx = fp->att_tx;
-
-  fp->numerology_index = config->sl_bwp_config.sl_scs;
-  fp->N_RB_SL = config->sl_carrier_config.sl_grid_size;
-  fp->N_RB_DL = fp->N_RB_SL;
-  fp->N_RB_UL = fp->N_RB_SL;
-  fp->Ncp = config->sl_bwp_config.sl_cyclic_prefix;
-
-  fp->frame_type = get_frame_type(fp->nr_band, fp->numerology_index);
-  int32_t uplink_frequency_offset = get_delta_duplex(fp->nr_band, fp->numerology_index);
-  uplink_frequency_offset *= 1000;
-
-  uint64_t bw_khz = (12*config->sl_carrier_config.sl_grid_size)*(15<<config->sl_bwp_config.sl_scs);
-  //REfer to section 3GPP spec 38.101 5.4E.2.1
-  //FrefV2x = Fref + deltashift + valueN*5Khz
-  uint32_t deltashift = (config->sl_carrier_config.sl_frequency_shift_7p5khz) ? 7500 : 0; //In Hz
-  deltashift += config->sl_carrier_config.sl_value_N * 5000; //In Hz
-  fp->sl_CarrierFreq = ((bw_khz >> 1) + config->sl_carrier_config.sl_frequency)*1000 ;
-  fp->sl_CarrierFreq += (deltashift >> 1);
-  fp->dl_CarrierFreq = fp->sl_CarrierFreq;
-  fp->ul_CarrierFreq = fp->dl_CarrierFreq + uplink_frequency_offset;
-
-  LOG_D(PHY,"bw_kHz %lu, deltashift:%d Hz\n",bw_khz,deltashift);
-  LOG_D(PHY,"CarrierFreq %lu Hz\n",fp->sl_CarrierFreq);
-
-  LOG_I(PHY, "Initializing frame parms: DL frequency %lu Hz, UL frequency %lu Hz: band %d, uldl offset %d Hz\n",
-                        fp->dl_CarrierFreq, fp->ul_CarrierFreq, fp->nr_band, uplink_frequency_offset);
-
-  AssertFatal(fp->frame_type==TDD, "Sidelink bands only support TDD");
-
-  AssertFatal(fp->ul_CarrierFreq == (fp->dl_CarrierFreq + uplink_frequency_offset),
-            "Disagreement in uplink frequency for band %d: ul_CarrierFreq = %lu Hz vs expected %lu Hz\n",
-            fp->nr_band, fp->ul_CarrierFreq, fp->dl_CarrierFreq + uplink_frequency_offset);
-
-  LOG_I(PHY,"Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",fp->numerology_index, fp->N_RB_DL, fp->Ncp);
-
-  if (fp->Ncp == EXTENDED)
-    AssertFatal(fp->numerology_index == NR_MU_2,"Invalid cyclic prefix %d for numerology index %d\n",
-                                                  fp->Ncp, fp->numerology_index);
-
-  set_scs_parameters(fp, fp->numerology_index, fp->N_RB_SL);
-
-  fp->slots_per_frame = 10* fp->slots_per_subframe;
-  fp->symbols_per_slot = ((fp->Ncp == NORMAL)? 14 : 12); // to redefine for different slot formats
-  fp->samples_per_subframe_wCP = fp->ofdm_symbol_size * fp->symbols_per_slot * fp->slots_per_subframe;
-  fp->samples_per_frame_wCP = 10 * fp->samples_per_subframe_wCP;
-  fp->samples_per_slot_wCP = fp->symbols_per_slot*fp->ofdm_symbol_size;
-  fp->samples_per_slotN0 = (fp->nb_prefix_samples + fp->ofdm_symbol_size) * fp->symbols_per_slot;
-  fp->samples_per_slot0 = fp->nb_prefix_samples0 + ((fp->symbols_per_slot-1)*fp->nb_prefix_samples) + (fp->symbols_per_slot*fp->ofdm_symbol_size);
-  fp->samples_per_subframe = (fp->nb_prefix_samples0 + fp->ofdm_symbol_size) * 2 +
-                             (fp->nb_prefix_samples + fp->ofdm_symbol_size) * (fp->symbols_per_slot * fp->slots_per_subframe - 2);
-  fp->get_samples_per_slot = &get_samples_per_slot;
-  fp->get_samples_slot_timestamp = &get_samples_slot_timestamp;
-  fp->samples_per_frame = 10 * fp->samples_per_subframe;
-  fp->freq_range = (fp->dl_CarrierFreq < 6e9)? nr_FR1 : nr_FR2;
-
-  //ssb_offset_pointa points to the first RE where Sidelink-PSBCH starts
-  fp->ssb_start_subcarrier = config->sl_bwp_config.sl_ssb_offset_point_a;


-  init_symbol_rotation(fp);
-  init_timeshift_rotation(fp);
-
-  //Not used for Sidelink
-  fp->Lmax = 0;
-  fp->L_ssb = 0;
-  fp->N_ssb = 0;
-  fp->half_frame_bit = 0;
-  fp->ssb_index = 0;
-  fp->ssb_type = 0;
-
-//#ifdef SL_DEBUG
-  LOG_I(PHY, "Dumping Sidelink Frame Parameters\n");
-  nr_dump_frame_parms(fp);
-//#endif
-
-  return 0;
-}
--- a/openair1/PHY/INIT/nr_phy_init.h
+++ b/openair1/PHY/INIT/nr_phy_init.h
@@ -29,10 +29,7 @@ int nr_get_ssb_start_symbol(NR_DL_FRAME_PARMS *fp,uint8_t i_ssb);
 int nr_init_frame_parms(nfapi_nr_config_request_scf_t *config, NR_DL_FRAME_PARMS *frame_parms);
 int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms, fapi_nr_config_request_t *config, uint16_t nr_band);
 void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink_frequency, int32_t uplink_frequency_offset, uint8_t mu, uint16_t nr_band);
-int nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *fp,
-                              sl_nr_phy_config_request_t* config,
-                              int threequarter_fs,
-                              uint32_t ofdm_offset_divisor);
+void nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *frame_parms, uint64_t sidelink_frequency, uint16_t nr_band);
 int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB);
 void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB);
 void init_nr_ue_transport(PHY_VARS_NR_UE *ue);
@@ -59,6 +56,5 @@ void free_nr_ue_ul_harq(NR_UL_UE_HARQ_t harq_list[NR_MAX_ULSCH_HARQ_PROCESSES],

 void phy_init_nr_top(PHY_VARS_NR_UE *ue);
 void phy_term_nr_top(void);
-void sl_ue_phy_init(PHY_VARS_NR_UE *UE);

 #endif
--- a/Show More
+++ b/Show More