diff --git a/openair2/ENB_APP/flexran_agent_ran_api.c b/openair2/ENB_APP/flexran_agent_ran_api.c
index 23b564d25e796cd76cc8c55921c7e6c6bcf7bcb1..61757d07030484d35a14722c5ad2257e9ea08696 100644
--- a/openair2/ENB_APP/flexran_agent_ran_api.c
+++ b/openair2/ENB_APP/flexran_agent_ran_api.c
@@ -188,157 +188,142 @@ int32_t flexran_get_TA(mid_t mod_id, mid_t ue_id, uint8_t cc_id)
   }
 }
 
-uint32_t flexran_get_total_size_dl_mac_sdus(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint32_t flexran_get_total_size_dl_mac_sdus(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].total_sdu_bytes;
-
 }
 
-uint32_t flexran_get_total_size_ul_mac_sdus(mid_t mod_id, mid_t ue_id, int cc_id){
-
-   if (!mac_is_present(mod_id)) return 0;
+uint32_t flexran_get_total_size_ul_mac_sdus(mid_t mod_id, mid_t ue_id, int cc_id)
+{
+  if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->eNB_stats[cc_id].total_ulsch_bytes_rx;
-
 }
 
-
-uint32_t flexran_get_TBS_dl(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint32_t flexran_get_TBS_dl(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].TBS;
 }
 
-uint32_t flexran_get_TBS_ul(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint32_t flexran_get_TBS_ul(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].ulsch_TBS;
-
 }
 
-uint16_t flexran_get_num_prb_retx_dl_per_ue(mid_t mod_id, mid_t ue_id, uint32_t cc_id) {
-
-if (!mac_is_present(mod_id)) return 0;
-return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].rbs_used_retx;
-
+uint16_t flexran_get_num_prb_retx_dl_per_ue(mid_t mod_id, mid_t ue_id, int cc_id)
+{
+  if (!mac_is_present(mod_id)) return 0;
+  return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].rbs_used_retx;
 }
 
-uint32_t flexran_get_num_prb_retx_ul_per_ue(mid_t mod_id, mid_t ue_id, uint32_t cc_id){
-
+uint32_t flexran_get_num_prb_retx_ul_per_ue(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].rbs_used_retx_rx;
-
 }
 
-uint16_t flexran_get_num_prb_dl_tx_per_ue(mid_t mod_id, mid_t ue_id, uint32_t cc_id){
-
-if (!mac_is_present(mod_id)) return 0;
-return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].rbs_used;
-
+uint16_t flexran_get_num_prb_dl_tx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id)
+{
+  if (!mac_is_present(mod_id)) return 0;
+  return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].rbs_used;
 }
 
-uint16_t flexran_get_num_prb_ul_rx_per_ue(mid_t mod_id, mid_t ue_id, uint32_t cc_id){
-
-if (!mac_is_present(mod_id)) return 0;
-return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].rbs_used_rx;
-
+uint16_t flexran_get_num_prb_ul_rx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id)
+{
+  if (!mac_is_present(mod_id)) return 0;
+  return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].rbs_used_rx;
 }
 
-
 uint8_t flexran_get_ue_wpmi(mid_t mod_id, mid_t ue_id, uint8_t cc_id)
 {
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.UE_sched_ctrl[ue_id].periodic_wideband_pmi[cc_id];
 }
 
-uint8_t flexran_get_mcs1_dl(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint8_t flexran_get_mcs1_dl(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].dlsch_mcs1;
 }
 
-uint8_t flexran_get_mcs2_dl(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint8_t flexran_get_mcs2_dl(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].dlsch_mcs2;
 }
 
-uint8_t flexran_get_mcs1_ul(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint8_t flexran_get_mcs1_ul(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].ulsch_mcs1;
-
 }
 
-uint8_t flexran_get_mcs2_ul(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint8_t flexran_get_mcs2_ul(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].ulsch_mcs2;
-
 }
 
-uint32_t flexran_get_total_prb_dl_tx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint32_t flexran_get_total_prb_dl_tx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].total_rbs_used;
-
 }
 
-uint32_t flexran_get_total_prb_ul_rx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint32_t flexran_get_total_prb_ul_rx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].total_rbs_used_rx;
 }
 
-uint32_t flexran_get_total_num_pdu_dl(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint32_t flexran_get_total_num_pdu_dl(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].total_num_pdus;
 }
 
-uint32_t flexran_get_total_num_pdu_ul(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint32_t flexran_get_total_num_pdu_ul(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].total_num_pdus_rx;
 }
 
-uint64_t flexran_get_total_TBS_dl(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint64_t flexran_get_total_TBS_dl(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].total_pdu_bytes;
 }
 
-uint64_t flexran_get_total_TBS_ul(mid_t mod_id, mid_t ue_id, int cc_id){
-
+uint64_t flexran_get_total_TBS_ul(mid_t mod_id, mid_t ue_id, int cc_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].total_ulsch_TBS;
 }
 
-int flexran_get_harq_round(mid_t mod_id, uint8_t cc_id, mid_t ue_id){
-
+int flexran_get_harq_round(mid_t mod_id, uint8_t cc_id, mid_t ue_id)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].harq_round;
-  
 }
 
-uint32_t flexran_get_num_mac_sdu_tx(mid_t mod_id, mid_t ue_id, int cc_id){
-
- if (!mac_is_present(mod_id)) return 0;
- return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].num_mac_sdu_tx; 
-
+uint32_t flexran_get_num_mac_sdu_tx(mid_t mod_id, mid_t ue_id, int cc_id)
+{
+  if (!mac_is_present(mod_id)) return 0;
+  return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].num_mac_sdu_tx;
 }
 
-unsigned char flexran_get_mac_sdu_lcid_index(mid_t mod_id, mid_t ue_id, int cc_id, int index){
-
+unsigned char flexran_get_mac_sdu_lcid_index(mid_t mod_id, mid_t ue_id, int cc_id, int index)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].lcid_sdu[index];
 }
 
-uint32_t flexran_get_mac_sdu_size(mid_t mod_id, mid_t ue_id, int cc_id, int lcid){
-
+uint32_t flexran_get_mac_sdu_size(mid_t mod_id, mid_t ue_id, int cc_id, int lcid)
+{
   if (!mac_is_present(mod_id)) return 0;
   return RC.mac[mod_id]->UE_list.eNB_UE_stats[cc_id][ue_id].sdu_length_tx[lcid];
-
 }
 
 
diff --git a/openair2/ENB_APP/flexran_agent_ran_api.h b/openair2/ENB_APP/flexran_agent_ran_api.h
index 498da257b14f0056dbbc59540c72a729e62f9915..05507223948b0804d4dd7bfe67c228254d69c7ef 100644
--- a/openair2/ENB_APP/flexran_agent_ran_api.h
+++ b/openair2/ENB_APP/flexran_agent_ran_api.h
@@ -120,10 +120,10 @@ uint32_t flexran_get_num_mac_sdu_tx(mid_t mod_id, mid_t ue_id, int cc_id);
 unsigned char flexran_get_mac_sdu_lcid_index(mid_t mod_id, mid_t ue_id, int cc_id, int index);
 
 /*Get MAC size sdus length dl*/
-uint32_t flexran_get_size_dl_mac_sdus(mid_t mod_id, uint32_t cc_id);
+uint32_t flexran_get_size_dl_mac_sdus(mid_t mod_id, int cc_id);
 
 /*Get MAC size sdus length ul */
-uint32_t flexran_get_size_ul_mac_sdus(mid_t mod_id, uint32_t cc_id);
+uint32_t flexran_get_size_ul_mac_sdus(mid_t mod_id, int cc_id);
 
 /*Get total size DL MAC SDUS*/
 uint32_t flexran_get_total_size_dl_mac_sdus(mid_t mod_id, mid_t ue_id, int cc_id);
@@ -144,16 +144,16 @@ uint32_t flexran_get_total_prb_dl_tx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id
 uint32_t flexran_get_total_prb_ul_rx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id);
 
 /*Get number of prb for tx per UE DL*/
-uint16_t flexran_get_num_prb_dl_tx_per_ue(mid_t mod_id, mid_t ue_id, uint32_t cc_id);
+uint16_t flexran_get_num_prb_dl_tx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id);
 
 /*Get number of prb for rx per UE UL*/
-uint16_t flexran_get_num_prb_ul_rx_per_ue(mid_t mod_id, mid_t ue_id, uint32_t cc_id);
+uint16_t flexran_get_num_prb_ul_rx_per_ue(mid_t mod_id, mid_t ue_id, int cc_id);
 
 /*Get number of prb for retx per UE UL*/
-uint32_t flexran_get_num_prb_retx_ul_per_ue(mid_t mod_id, mid_t ue_id, uint32_t cc_id);
+uint32_t flexran_get_num_prb_retx_ul_per_ue(mid_t mod_id, mid_t ue_id, int cc_id);
 
 /*Get number of prb for retx per UE*/
-uint16_t flexran_get_num_prb_retx_dl_per_ue(mid_t mod_id, mid_t ue_id, uint32_t cc_id);
+uint16_t flexran_get_num_prb_retx_dl_per_ue(mid_t mod_id, mid_t ue_id, int cc_id);
 
 /*MCS before rate adaptation DL*/
 uint8_t flexran_get_mcs1_dl(mid_t mod_id, mid_t ue_id, int cc_id);
@@ -179,6 +179,9 @@ uint64_t flexran_get_total_TBS_dl(mid_t mod_id, mid_t ue_id, int cc_id);
 /*Get total TBS DL*/
 uint64_t flexran_get_total_TBS_ul(mid_t mod_id, mid_t ue_id, int cc_id);
 
+/* Get the current HARQ round for UE ue_id */
+int flexran_get_harq_round(mid_t mod_id, uint8_t cc_id, mid_t ue_id);
+
 /* Get the number of active component carriers for a specific UE */
 int flexran_get_active_CC(mid_t mod_id, mid_t ue_id);