diff --git a/openair2/LAYER2/MAC/eNB_scheduler_RA.c b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
index 2744fa5b870ccc2bc51f71fff12b99d87e33931b..701c228e81ee071e289a9d50c9368b62ebcff614 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_RA.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
@@ -25,7 +25,7 @@
 
   Address      : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
 
-*******************************************************************************/
+ *******************************************************************************/
 
 /*! \file eNB_scheduler_primitives.c
  * \brief primitives used by eNB for BCH, RACH, ULSCH, DLSCH scheduling
@@ -68,416 +68,416 @@ extern inline unsigned int taus(void);
 
 void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,unsigned char Msg3_subframe,unsigned int *nprb,unsigned int *nCCE) {
 
-  int CC_id;
-  eNB_MAC_INST *eNB = &eNB_mac_inst[module_idP];
-
-
-  RA_TEMPLATE *RA_template;
-  unsigned char i;//,harq_pid,round;
-  uint16_t rrc_sdu_length;
-  unsigned char lcid,offset;
-  module_id_t UE_id= UE_INDEX_INVALID;
-  unsigned short TBsize = -1;
-  unsigned short msg4_padding,msg4_post_padding,msg4_header;
-
-  start_meas(&eNB->schedule_ra);
-
-  for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
-
-    RA_template = (RA_TEMPLATE *)&eNB->common_channels[CC_id].RA_template[0];
-    for (i=0;i<NB_RA_PROC_MAX;i++) {
-
-      if (RA_template[i].RA_active == TRUE) {
-
-	LOG_D(MAC,"[eNB %d][RAPROC] RA %d is active (generate RAR %d, generate_Msg4 %d, wait_ack_Msg4 %d, rnti %x)\n",
-              module_idP,i,RA_template[i].generate_rar,RA_template[i].generate_Msg4,RA_template[i].wait_ack_Msg4, RA_template[i].rnti);
-
-	if (RA_template[i].generate_rar == 1) {
-	  nprb[CC_id]= nprb[CC_id] + 3;
-	  nCCE[CC_id] = nCCE[CC_id] + 4;
-	  RA_template[i].Msg3_subframe=Msg3_subframe;
-	}
-	else if (RA_template[i].generate_Msg4 == 1) {
-
-	  // check for Msg4 Message
-	  UE_id = find_UE_id(module_idP,RA_template[i].rnti);
-	  if (Is_rrc_registered == 1) {
-
-	    // Get RRCConnectionSetup for Piggyback
-	    rrc_sdu_length = mac_rrc_data_req(module_idP,
-					      frameP,
-					      CCCH,1,
-					      &eNB->common_channels[CC_id].CCCH_pdu.payload[0],
-					      1,
-					      module_idP,
-					      0); // not used in this case
-	    if (rrc_sdu_length == -1)
-	      mac_xface->macphy_exit("[MAC][eNB Scheduler] CCCH not allocated\n");
-	    else {
-	      //msg("[MAC][eNB %d] Frame %d, subframeP %d: got %d bytes from RRC\n",module_idP,frameP, subframeP,rrc_sdu_length);
-	    }
-	  }
-
-	  LOG_D(MAC,"[eNB %d][RAPROC] Frame %d, subframeP %d: UE_id %d, Is_rrc_registered %d, rrc_sdu_length %d\n",
-		module_idP,frameP, subframeP,UE_id, Is_rrc_registered,rrc_sdu_length);
-
-	  if (rrc_sdu_length>0) {
-	    LOG_I(MAC,"[eNB %d][RAPROC] Frame %d, subframeP %d: Generating Msg4 with RRC Piggyback (RA proc %d, RNTI %x)\n",
-		  module_idP,frameP, subframeP,i,RA_template[i].rnti);
-
-	    //msg("[MAC][eNB %d][RAPROC] Frame %d, subframeP %d: Received %d bytes for Msg4: \n",module_idP,frameP,subframeP,rrc_sdu_length);
-	    //	  for (j=0;j<rrc_sdu_length;j++)
-	    //	    msg("%x ",(unsigned char)eNB_mac_inst[module_idP][CC_id].CCCH_pdu.payload[j]);
-	    //	  msg("\n");
-	    //	  msg("[MAC][eNB] Frame %d, subframeP %d: Generated DLSCH (Msg4) DCI, format 1A, for UE %d\n",frameP, subframeP,UE_id);
-	    // Schedule Reflection of Connection request
-
-
-
-	    // Compute MCS for 3 PRB
-	    msg4_header = 1+6+1;  // CR header, CR CE, SDU header
-
-	    if (mac_xface->lte_frame_parms->frame_type == TDD) {
-
-	      switch (mac_xface->lte_frame_parms->N_RB_DL) {
-	      case 6:
-		((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
-
-		if ((rrc_sdu_length+msg4_header) <= 22) {
-		  ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
-		  TBsize = 22;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 28) {
-		  ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
-		  TBsize = 28;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 32) {
-		  ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
-		  TBsize = 32;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 41) {
-		  ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
-		  TBsize = 41;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 49) {
-		  ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
-		  TBsize = 49;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 57) {
-		  ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
-		  TBsize = 57;
-		}
-		break;
-	      case 25:
-
-		((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
-
-		if ((rrc_sdu_length+msg4_header) <= 22) {
-		  ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
-		  TBsize = 22;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 28) {
-		  ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
-		  TBsize = 28;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 32) {
-		  ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
-		  TBsize = 32;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 41) {
-		  ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
-		  TBsize = 41;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 49) {
-		  ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
-		  TBsize = 49;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 57) {
-		  ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
-		  TBsize = 57;
-		}
-		break;
-	      case 50:
-
-		((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
-
-		if ((rrc_sdu_length+msg4_header) <= 22) {
-		  ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
-		  TBsize = 22;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 28) {
-		  ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
-		  TBsize = 28;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 32) {
-		  ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
-		  TBsize = 32;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 41) {
-		  ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
-		  TBsize = 41;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 49) {
-		  ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
-		  TBsize = 49;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 57) {
-		  ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
-		  TBsize = 57;
-		}
-		break;
-	      case 100:
-
-		((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
-
-		if ((rrc_sdu_length+msg4_header) <= 22) {
-		  ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
-		  TBsize = 22;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 28) {
-		  ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
-		  TBsize = 28;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 32) {
-		  ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
-		  TBsize = 32;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 41) {
-		  ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
-		  TBsize = 41;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 49) {
-		  ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
-		  TBsize = 49;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 57) {
-		  ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
-		  TBsize = 57;
-		}
-		break;
-	      }
-	    }
-	    else { // FDD DCI
-	      switch (mac_xface->lte_frame_parms->N_RB_DL) {
-	      case 6:
-		((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
-
-		if ((rrc_sdu_length+msg4_header) <= 22) {
-		  ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
-		  TBsize = 22;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 28) {
-		  ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
-		  TBsize = 28;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 32) {
-		  ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
-		  TBsize = 32;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 41) {
-		  ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
-		  TBsize = 41;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 49) {
-		  ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
-		  TBsize = 49;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 57) {
-		  ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
-		  TBsize = 57;
-		}
-		break;
-	      case 25:
-		((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
-
-		if ((rrc_sdu_length+msg4_header) <= 22) {
-		  ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
-		  TBsize = 22;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 28) {
-		  ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
-		  TBsize = 28;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 32) {
-		  ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
-		  TBsize = 32;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 41) {
-		  ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
-		  TBsize = 41;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 49) {
-		  ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
-		  TBsize = 49;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 57) {
-		  ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
-		  TBsize = 57;
-		}
-		break;
-	      case 50:
-		((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
-
-		if ((rrc_sdu_length+msg4_header) <= 22) {
-		  ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
-		  TBsize = 22;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 28) {
-		  ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
-		  TBsize = 28;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 32) {
-		  ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
-		  TBsize = 32;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 41) {
-		  ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
-		  TBsize = 41;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 49) {
-		  ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
-		  TBsize = 49;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 57) {
-		  ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
-		  TBsize = 57;
-		}
-		break;
-	      case 100:
-		((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
-
-		if ((rrc_sdu_length+msg4_header) <= 22) {
-		  ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
-		  TBsize = 22;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 28) {
-		  ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
-		  TBsize = 28;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 32) {
-		  ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
-		  TBsize = 32;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 41) {
-		  ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
-		  TBsize = 41;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 49) {
-		  ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
-		  TBsize = 49;
-		}
-		else if ((rrc_sdu_length+msg4_header) <= 57) {
-		  ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
-		  TBsize = 57;
-		}
-		break;
-	      }
-	    }
-	    RA_template[i].generate_Msg4=0;
-	    RA_template[i].generate_Msg4_dci=1;
-	    RA_template[i].wait_ack_Msg4=1;
-	    RA_template[i].RA_active = FALSE;
-	    lcid=0;
-
-	    if ((TBsize - rrc_sdu_length - msg4_header) <= 2) {
-	      msg4_padding = TBsize - rrc_sdu_length - msg4_header;
-	      msg4_post_padding = 0;
-	    }
-	    else {
-	      msg4_padding = 0;
-	      msg4_post_padding = TBsize - rrc_sdu_length - msg4_header -1;
-	    }
-	    LOG_I(MAC,"[eNB %d][RAPROC] Frame %d subframeP %d Msg4 : TBS %d, sdu_len %d, msg4_header %d, msg4_padding %d, msg4_post_padding %d\n",
-		  module_idP,frameP,subframeP,TBsize,rrc_sdu_length,msg4_header,msg4_padding,msg4_post_padding);
-	    offset = generate_dlsch_header((unsigned char*)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
-					   1,                           //num_sdus
-					   &rrc_sdu_length,             //
-					   &lcid,                       // sdu_lcid
-					   255,                         // no drx
-					   0,                           // no timing advance
-					   RA_template[i].cont_res_id,  // contention res id
-					   msg4_padding,                // no padding
-					   msg4_post_padding);
-
-	    memcpy((void*)&eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0][(unsigned char)offset],
-		   &eNB->common_channels[CC_id].CCCH_pdu.payload[0],
-		   rrc_sdu_length);
+    int CC_id;
+    eNB_MAC_INST *eNB = &eNB_mac_inst[module_idP];
+
+
+    RA_TEMPLATE *RA_template;
+    unsigned char i;//,harq_pid,round;
+    uint16_t rrc_sdu_length;
+    unsigned char lcid,offset;
+    module_id_t UE_id= UE_INDEX_INVALID;
+    unsigned short TBsize = -1;
+    unsigned short msg4_padding,msg4_post_padding,msg4_header;
+
+    start_meas(&eNB->schedule_ra);
+
+    for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
+
+        RA_template = (RA_TEMPLATE *)&eNB->common_channels[CC_id].RA_template[0];
+        for (i=0;i<NB_RA_PROC_MAX;i++) {
+
+            if (RA_template[i].RA_active == TRUE) {
+
+                LOG_D(MAC,"[eNB %d][RAPROC] RA %d is active (generate RAR %d, generate_Msg4 %d, wait_ack_Msg4 %d, rnti %x)\n",
+                      module_idP,i,RA_template[i].generate_rar,RA_template[i].generate_Msg4,RA_template[i].wait_ack_Msg4, RA_template[i].rnti);
+
+                if (RA_template[i].generate_rar == 1) {
+                    nprb[CC_id]= nprb[CC_id] + 3;
+                    nCCE[CC_id] = nCCE[CC_id] + 4;
+                    RA_template[i].Msg3_subframe=Msg3_subframe;
+                }
+                else if (RA_template[i].generate_Msg4 == 1) {
+
+                    // check for Msg4 Message
+                    UE_id = find_UE_id(module_idP,RA_template[i].rnti);
+                    if (Is_rrc_registered == 1) {
+
+                        // Get RRCConnectionSetup for Piggyback
+                        rrc_sdu_length = mac_rrc_data_req(module_idP,
+                                                          frameP,
+                                                          CCCH,1,
+                                                          &eNB->common_channels[CC_id].CCCH_pdu.payload[0],
+                                                          1,
+                                                          module_idP,
+                                                          0); // not used in this case
+                        if (rrc_sdu_length == -1)
+                            mac_xface->macphy_exit("[MAC][eNB Scheduler] CCCH not allocated\n");
+                        else {
+                            //msg("[MAC][eNB %d] Frame %d, subframeP %d: got %d bytes from RRC\n",module_idP,frameP, subframeP,rrc_sdu_length);
+                        }
+                    }
+
+                    LOG_D(MAC,"[eNB %d][RAPROC] Frame %d, subframeP %d: UE_id %d, Is_rrc_registered %d, rrc_sdu_length %d\n",
+                          module_idP,frameP, subframeP,UE_id, Is_rrc_registered,rrc_sdu_length);
+
+                    if (rrc_sdu_length>0) {
+                        LOG_I(MAC,"[eNB %d][RAPROC] Frame %d, subframeP %d: Generating Msg4 with RRC Piggyback (RA proc %d, RNTI %x)\n",
+                              module_idP,frameP, subframeP,i,RA_template[i].rnti);
+
+                        //msg("[MAC][eNB %d][RAPROC] Frame %d, subframeP %d: Received %d bytes for Msg4: \n",module_idP,frameP,subframeP,rrc_sdu_length);
+                        //	  for (j=0;j<rrc_sdu_length;j++)
+                        //	    msg("%x ",(unsigned char)eNB_mac_inst[module_idP][CC_id].CCCH_pdu.payload[j]);
+                        //	  msg("\n");
+                        //	  msg("[MAC][eNB] Frame %d, subframeP %d: Generated DLSCH (Msg4) DCI, format 1A, for UE %d\n",frameP, subframeP,UE_id);
+                        // Schedule Reflection of Connection request
+
+
+
+                        // Compute MCS for 3 PRB
+                        msg4_header = 1+6+1;  // CR header, CR CE, SDU header
+
+                        if (mac_xface->lte_frame_parms->frame_type == TDD) {
+
+                            switch (mac_xface->lte_frame_parms->N_RB_DL) {
+                                case 6:
+                                    ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
+
+                                    if ((rrc_sdu_length+msg4_header) <= 22) {
+                                        ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
+                                        TBsize = 22;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 28) {
+                                        ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
+                                        TBsize = 28;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 32) {
+                                        ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
+                                        TBsize = 32;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 41) {
+                                        ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
+                                        TBsize = 41;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 49) {
+                                        ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
+                                        TBsize = 49;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 57) {
+                                        ((DCI1A_1_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
+                                        TBsize = 57;
+                                    }
+                                    break;
+                                case 25:
+
+                                    ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
+
+                                    if ((rrc_sdu_length+msg4_header) <= 22) {
+                                        ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
+                                        TBsize = 22;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 28) {
+                                        ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
+                                        TBsize = 28;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 32) {
+                                        ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
+                                        TBsize = 32;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 41) {
+                                        ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
+                                        TBsize = 41;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 49) {
+                                        ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
+                                        TBsize = 49;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 57) {
+                                        ((DCI1A_5MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
+                                        TBsize = 57;
+                                    }
+                                    break;
+                                case 50:
+
+                                    ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
+
+                                    if ((rrc_sdu_length+msg4_header) <= 22) {
+                                        ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
+                                        TBsize = 22;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 28) {
+                                        ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
+                                        TBsize = 28;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 32) {
+                                        ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
+                                        TBsize = 32;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 41) {
+                                        ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
+                                        TBsize = 41;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 49) {
+                                        ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
+                                        TBsize = 49;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 57) {
+                                        ((DCI1A_10MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
+                                        TBsize = 57;
+                                    }
+                                    break;
+                                case 100:
+
+                                    ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
+
+                                    if ((rrc_sdu_length+msg4_header) <= 22) {
+                                        ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
+                                        TBsize = 22;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 28) {
+                                        ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
+                                        TBsize = 28;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 32) {
+                                        ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
+                                        TBsize = 32;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 41) {
+                                        ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
+                                        TBsize = 41;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 49) {
+                                        ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
+                                        TBsize = 49;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 57) {
+                                        ((DCI1A_20MHz_TDD_1_6_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
+                                        TBsize = 57;
+                                    }
+                                    break;
+                            }
+                        }
+                        else { // FDD DCI
+                            switch (mac_xface->lte_frame_parms->N_RB_DL) {
+                                case 6:
+                                    ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
+
+                                    if ((rrc_sdu_length+msg4_header) <= 22) {
+                                        ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
+                                        TBsize = 22;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 28) {
+                                        ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
+                                        TBsize = 28;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 32) {
+                                        ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
+                                        TBsize = 32;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 41) {
+                                        ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
+                                        TBsize = 41;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 49) {
+                                        ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
+                                        TBsize = 49;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 57) {
+                                        ((DCI1A_1_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
+                                        TBsize = 57;
+                                    }
+                                    break;
+                                case 25:
+                                    ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
+
+                                    if ((rrc_sdu_length+msg4_header) <= 22) {
+                                        ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
+                                        TBsize = 22;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 28) {
+                                        ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
+                                        TBsize = 28;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 32) {
+                                        ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
+                                        TBsize = 32;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 41) {
+                                        ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
+                                        TBsize = 41;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 49) {
+                                        ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
+                                        TBsize = 49;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 57) {
+                                        ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
+                                        TBsize = 57;
+                                    }
+                                    break;
+                                case 50:
+                                    ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
+
+                                    if ((rrc_sdu_length+msg4_header) <= 22) {
+                                        ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
+                                        TBsize = 22;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 28) {
+                                        ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
+                                        TBsize = 28;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 32) {
+                                        ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
+                                        TBsize = 32;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 41) {
+                                        ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
+                                        TBsize = 41;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 49) {
+                                        ((DCI1A_10MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
+                                        TBsize = 49;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 57) {
+                                        ((DCI1A_5MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
+                                        TBsize = 57;
+                                    }
+                                    break;
+                                case 100:
+                                    ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->ndi=1;
+
+                                    if ((rrc_sdu_length+msg4_header) <= 22) {
+                                        ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=4;
+                                        TBsize = 22;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 28) {
+                                        ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=5;
+                                        TBsize = 28;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 32) {
+                                        ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=6;
+                                        TBsize = 32;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 41) {
+                                        ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=7;
+                                        TBsize = 41;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 49) {
+                                        ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=8;
+                                        TBsize = 49;
+                                    }
+                                    else if ((rrc_sdu_length+msg4_header) <= 57) {
+                                        ((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
+                                        TBsize = 57;
+                                    }
+                                    break;
+                            }
+                        }
+                        RA_template[i].generate_Msg4=0;
+                        RA_template[i].generate_Msg4_dci=1;
+                        RA_template[i].wait_ack_Msg4=1;
+                        RA_template[i].RA_active = FALSE;
+                        lcid=0;
+
+                        if ((TBsize - rrc_sdu_length - msg4_header) <= 2) {
+                            msg4_padding = TBsize - rrc_sdu_length - msg4_header;
+                            msg4_post_padding = 0;
+                        }
+                        else {
+                            msg4_padding = 0;
+                            msg4_post_padding = TBsize - rrc_sdu_length - msg4_header -1;
+                        }
+                        LOG_I(MAC,"[eNB %d][RAPROC] Frame %d subframeP %d Msg4 : TBS %d, sdu_len %d, msg4_header %d, msg4_padding %d, msg4_post_padding %d\n",
+                              module_idP,frameP,subframeP,TBsize,rrc_sdu_length,msg4_header,msg4_padding,msg4_post_padding);
+                        offset = generate_dlsch_header((unsigned char*)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
+                                                       1,                           //num_sdus
+                                                       &rrc_sdu_length,             //
+                                                       &lcid,                       // sdu_lcid
+                                                       255,                         // no drx
+                                                       0,                           // no timing advance
+                                                       RA_template[i].cont_res_id,  // contention res id
+                                                       msg4_padding,                // no padding
+                                                       msg4_post_padding);
+
+                        memcpy((void*)&eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0][(unsigned char)offset],
+                               &eNB->common_channels[CC_id].CCCH_pdu.payload[0],
+                               rrc_sdu_length);
 
 #if defined(USER_MODE) && defined(OAI_EMU)
-	    if (oai_emulation.info.opt_enabled){
-	      trace_pdu(1, (uint8_t *)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
-			rrc_sdu_length, UE_id, 3, UE_RNTI(module_idP, UE_id),
-			eNB->subframe,0,0);
-	      LOG_D(OPT,"[eNB %d][DLSCH] Frame %d trace pdu for rnti %x with size %d\n",
-		    module_idP, frameP, UE_RNTI(module_idP,UE_id), rrc_sdu_length);
-	    }
+                        if (oai_emulation.info.opt_enabled){
+                            trace_pdu(1, (uint8_t *)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
+                                      rrc_sdu_length, UE_id, 3, UE_RNTI(module_idP, UE_id),
+                                      eNB->subframe,0,0);
+                            LOG_D(OPT,"[eNB %d][DLSCH] Frame %d trace pdu for rnti %x with size %d\n",
+                                  module_idP, frameP, UE_RNTI(module_idP,UE_id), rrc_sdu_length);
+                        }
 #endif
-	    nprb[CC_id]= nprb[CC_id] + 3;
-	    nCCE[CC_id] = nCCE[CC_id] + 4;
-	  }
-	  //try here
-	}
-	/*
+                        nprb[CC_id]= nprb[CC_id] + 3;
+                        nCCE[CC_id] = nCCE[CC_id] + 4;
+                    }
+                    //try here
+                }
+                /*
 	  else if (eNB_mac_inst[module_idP][CC_id].RA_template[i].wait_ack_Msg4==1) {
 	  // check HARQ status and retransmit if necessary
 	  LOG_I(MAC,"[eNB %d][RAPROC] Frame %d, subframeP %d: Checking if Msg4 was acknowledged :\n",module_idP,frameP,subframeP);
 	  // Get candidate harq_pid from PHY
 	  mac_xface->get_ue_active_harq_pid(module_idP,eNB_mac_inst[module_idP][CC_id].RA_template[i].rnti,subframeP,&harq_pid,&round,0);
 	  if (round>0) {
-	  *nprb= (*nprb) + 3;
-	  *nCCE = (*nCCE) + 4;
+                 *nprb= (*nprb) + 3;
+                 *nCCE = (*nCCE) + 4;
 	  }
 	  }
-	*/
-      }
+                 */
+            }
+        }
     }
-  }
-  stop_meas(&eNB->schedule_ra);
+    stop_meas(&eNB->schedule_ra);
 }
 
 void initiate_ra_proc(module_id_t module_idP, int CC_id,frame_t frameP, uint16_t preamble_index,int16_t timing_offset,uint8_t sect_id,sub_frame_t subframeP,uint8_t f_id) {
 
-  uint8_t i;
-  RA_TEMPLATE *RA_template = (RA_TEMPLATE *)&eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[0];
-
-  LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Initiating RA procedure for preamble index %d\n",module_idP,frameP,preamble_index);
-
-  for (i=0;i<NB_RA_PROC_MAX;i++) {
-    if (RA_template[i].RA_active==FALSE) {
-      RA_template[i].RA_active=TRUE;
-      RA_template[i].generate_rar=1;
-      RA_template[i].generate_Msg4=0;
-      RA_template[i].wait_ack_Msg4=0;
-      RA_template[i].timing_offset=timing_offset;
-      // Put in random rnti (to be replaced with proper procedure!!)
-      RA_template[i].rnti = taus();
-      RA_template[i].RA_rnti = 1+subframeP+(10*f_id);
-      RA_template[i].preamble_index = preamble_index;
-      LOG_D(MAC,"[eNB %d][RAPROC] Frame %d Activating RAR generation for process %d, rnti %x, RA_active %d\n",
-	    module_idP,frameP,i,RA_template[i].rnti,
-	    RA_template[i].RA_active);
-
-      return;
+    uint8_t i;
+    RA_TEMPLATE *RA_template = (RA_TEMPLATE *)&eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[0];
+
+    LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Initiating RA procedure for preamble index %d\n",module_idP,frameP,preamble_index);
+
+    for (i=0;i<NB_RA_PROC_MAX;i++) {
+        if (RA_template[i].RA_active==FALSE) {
+            RA_template[i].RA_active=TRUE;
+            RA_template[i].generate_rar=1;
+            RA_template[i].generate_Msg4=0;
+            RA_template[i].wait_ack_Msg4=0;
+            RA_template[i].timing_offset=timing_offset;
+            // Put in random rnti (to be replaced with proper procedure!!)
+            RA_template[i].rnti = taus();
+            RA_template[i].RA_rnti = 1+subframeP+(10*f_id);
+            RA_template[i].preamble_index = preamble_index;
+            LOG_D(MAC,"[eNB %d][RAPROC] Frame %d Activating RAR generation for process %d, rnti %x, RA_active %d\n",
+                  module_idP,frameP,i,RA_template[i].rnti,
+                  RA_template[i].RA_active);
+
+            return;
+        }
     }
-  }
 }
 
 void cancel_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP, rnti_t rnti) {
-  unsigned char i;
-  RA_TEMPLATE *RA_template = (RA_TEMPLATE *)&eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[0];
-
-  LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Cancelling RA procedure for UE rnti %x\n",module_idP,frameP,rnti);
-
-  for (i=0;i<NB_RA_PROC_MAX;i++) {
-    if (rnti == RA_template[i].rnti) {
-      RA_template[i].RA_active=FALSE;
-      RA_template[i].generate_rar=0;
-      RA_template[i].generate_Msg4=0;
-      RA_template[i].wait_ack_Msg4=0;
-      RA_template[i].timing_offset=0;
-      RA_template[i].RRC_timer=20;
-      RA_template[i].rnti = 0;
+    unsigned char i;
+    RA_TEMPLATE *RA_template = (RA_TEMPLATE *)&eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[0];
+
+    LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Cancelling RA procedure for UE rnti %x\n",module_idP,frameP,rnti);
+
+    for (i=0;i<NB_RA_PROC_MAX;i++) {
+        if (rnti == RA_template[i].rnti) {
+            RA_template[i].RA_active=FALSE;
+            RA_template[i].generate_rar=0;
+            RA_template[i].generate_Msg4=0;
+            RA_template[i].wait_ack_Msg4=0;
+            RA_template[i].timing_offset=0;
+            RA_template[i].RRC_timer=20;
+            RA_template[i].rnti = 0;
+        }
     }
-  }
 }
 
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 8c978017c50d0ff516ecd3958f69ee6cd0fb6ef7..882d1542dce6b46e2160c20c1e1f3862e22227ed 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -25,7 +25,7 @@
 
   Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
 
-*******************************************************************************/
+ *******************************************************************************/
 
 /*! \file eNB_scheduler_ulsch.c
  * \brief eNB procedures for the ULSCH transport channel
@@ -71,294 +71,294 @@ uint8_t rb_table[33] = {1,2,3,4,5,6,8,9,10,12,15,16,18,20,24,25,27,30,32,36,40,4
 
 void rx_sdu(module_id_t enb_mod_idP,int CC_idP,frame_t frameP,rnti_t rntiP,uint8_t *sduP, uint16_t sdu_lenP,int harq_pidP,uint8_t *msg3_flagP) {
 
-  unsigned char  rx_ces[MAX_NUM_CE],num_ce,num_sdu,i,*payload_ptr;
-  unsigned char  rx_lcids[NB_RB_MAX];
-  unsigned short rx_lengths[NB_RB_MAX];
-  int    UE_id = find_UE_id(enb_mod_idP,rntiP);
-  int ii,j;
-  eNB_MAC_INST *eNB = &eNB_mac_inst[enb_mod_idP];
-  UE_list_t *UE_list= &eNB->UE_list;
-
-  start_meas(&eNB->rx_ulsch_sdu);
-  
-  if ((UE_id >  NUMBER_OF_UE_MAX) || (UE_id == -1)  )
-    for(ii=0; ii<NB_RB_MAX; ii++) rx_lengths[ii] = 0;
-
-  vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU,1);
-
-  LOG_D(MAC,"[eNB %d] Received ULSCH sdu from PHY (rnti %x, UE_id %d), parsing header\n",enb_mod_idP,rntiP,UE_id);
-  payload_ptr = parse_ulsch_header(sduP,&num_ce,&num_sdu,rx_ces,rx_lcids,rx_lengths,sdu_lenP);
-
-  // control element
-  for (i=0;i<num_ce;i++) {
-
-    switch (rx_ces[i]) { // implement and process BSR + CRNTI +
-    case POWER_HEADROOM:
-      if (UE_id != UE_INDEX_INVALID ){
-	UE_list->UE_template[CC_idP][UE_id].phr_info =  (payload_ptr[0] & 0x3f) - PHR_MAPPING_OFFSET;
-	LOG_D(MAC, "[eNB] MAC CE_LCID %d : Received PHR PH = %d (db)\n", rx_ces[i], UE_list->UE_template[CC_idP][UE_id].phr_info);
-	UE_list->UE_template[CC_idP][UE_id].phr_info_configured=1;
-      }
-      payload_ptr+=sizeof(POWER_HEADROOM_CMD);
-      break;
-    case CRNTI:
-      LOG_D(MAC, "[eNB] MAC CE_LCID %d : Received CRNTI %d \n", rx_ces[i], payload_ptr[0]);
-      payload_ptr+=1;
-      break;
-    case TRUNCATED_BSR:
-    case SHORT_BSR: {
-      if (UE_id  != UE_INDEX_INVALID ){
-	uint8_t lcgid;
-	lcgid = (payload_ptr[0] >> 6);
-	LOG_D(MAC, "[eNB] MAC CE_LCID %d : Received short BSR LCGID = %u bsr = %d\n",
-	      rx_ces[i], lcgid, payload_ptr[0] & 0x3f);
-	UE_list->UE_template[CC_idP][UE_id].bsr_info[lcgid] = (payload_ptr[0] & 0x3f);
-	if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[lcgid] == 0 )
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[lcgid]=frameP;
-      }
-      payload_ptr += 1;//sizeof(SHORT_BSR); // fixme
-    } break;
-    case LONG_BSR:
-      if (UE_id  != UE_INDEX_INVALID ){
-	UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0] = ((payload_ptr[0] & 0xFC) >> 2);
-	UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1] =
-	  ((payload_ptr[0] & 0x03) << 4) | ((payload_ptr[1] & 0xF0) >> 4);
-	UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2] =
-	  ((payload_ptr[1] & 0x0F) << 2) | ((payload_ptr[2] & 0xC0) >> 6);
-	UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID3] = (payload_ptr[2] & 0x3F);
-	LOG_D(MAC, "[eNB] MAC CE_LCID %d: Received long BSR LCGID0 = %u LCGID1 = "
-	      "%u LCGID2 = %u LCGID3 = %u\n",
-	      rx_ces[i],
-	      UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0],
-	      UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1],
-	      UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2],
-	      UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID3]);
-	
-	if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0] == 0 )
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0]=0;
-	else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0] == 0) 
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0]=frameP;
-       	
-	if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1] == 0 )
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1]=0;
-	else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1] == 0)
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1]=frameP;
-	
-	if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2] == 0 )
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2]=0;
-	else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2] == 0) 
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2]=frameP;
-       
-	if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID3] == 0 )
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3]= 0;
-	else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3] == 0) 
-	  UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3]=frameP;
-       
-      }
-      payload_ptr += 3;////sizeof(LONG_BSR);
-      break;
-    default:
-      LOG_E(MAC, "[eNB] Received unknown MAC header (0x%02x)\n", rx_ces[i]);
-      break;
+    unsigned char  rx_ces[MAX_NUM_CE],num_ce,num_sdu,i,*payload_ptr;
+    unsigned char  rx_lcids[NB_RB_MAX];
+    unsigned short rx_lengths[NB_RB_MAX];
+    int    UE_id = find_UE_id(enb_mod_idP,rntiP);
+    int ii,j;
+    eNB_MAC_INST *eNB = &eNB_mac_inst[enb_mod_idP];
+    UE_list_t *UE_list= &eNB->UE_list;
+
+    start_meas(&eNB->rx_ulsch_sdu);
+
+    if ((UE_id >  NUMBER_OF_UE_MAX) || (UE_id == -1)  )
+        for(ii=0; ii<NB_RB_MAX; ii++) rx_lengths[ii] = 0;
+
+    vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU,1);
+
+    LOG_D(MAC,"[eNB %d] Received ULSCH sdu from PHY (rnti %x, UE_id %d), parsing header\n",enb_mod_idP,rntiP,UE_id);
+    payload_ptr = parse_ulsch_header(sduP,&num_ce,&num_sdu,rx_ces,rx_lcids,rx_lengths,sdu_lenP);
+
+    // control element
+    for (i=0;i<num_ce;i++) {
+
+        switch (rx_ces[i]) { // implement and process BSR + CRNTI +
+            case POWER_HEADROOM:
+                if (UE_id != UE_INDEX_INVALID ){
+                    UE_list->UE_template[CC_idP][UE_id].phr_info =  (payload_ptr[0] & 0x3f) - PHR_MAPPING_OFFSET;
+                    LOG_D(MAC, "[eNB] MAC CE_LCID %d : Received PHR PH = %d (db)\n", rx_ces[i], UE_list->UE_template[CC_idP][UE_id].phr_info);
+                    UE_list->UE_template[CC_idP][UE_id].phr_info_configured=1;
+                }
+                payload_ptr+=sizeof(POWER_HEADROOM_CMD);
+                break;
+            case CRNTI:
+                LOG_D(MAC, "[eNB] MAC CE_LCID %d : Received CRNTI %d \n", rx_ces[i], payload_ptr[0]);
+                payload_ptr+=1;
+                break;
+            case TRUNCATED_BSR:
+            case SHORT_BSR: {
+                if (UE_id  != UE_INDEX_INVALID ){
+                    uint8_t lcgid;
+                    lcgid = (payload_ptr[0] >> 6);
+                    LOG_D(MAC, "[eNB] MAC CE_LCID %d : Received short BSR LCGID = %u bsr = %d\n",
+                          rx_ces[i], lcgid, payload_ptr[0] & 0x3f);
+                    UE_list->UE_template[CC_idP][UE_id].bsr_info[lcgid] = (payload_ptr[0] & 0x3f);
+                    if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[lcgid] == 0 )
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[lcgid]=frameP;
+                }
+                payload_ptr += 1;//sizeof(SHORT_BSR); // fixme
+            } break;
+            case LONG_BSR:
+                if (UE_id  != UE_INDEX_INVALID ){
+                    UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0] = ((payload_ptr[0] & 0xFC) >> 2);
+                    UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1] =
+                                    ((payload_ptr[0] & 0x03) << 4) | ((payload_ptr[1] & 0xF0) >> 4);
+                    UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2] =
+                                    ((payload_ptr[1] & 0x0F) << 2) | ((payload_ptr[2] & 0xC0) >> 6);
+                    UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID3] = (payload_ptr[2] & 0x3F);
+                    LOG_D(MAC, "[eNB] MAC CE_LCID %d: Received long BSR LCGID0 = %u LCGID1 = "
+                          "%u LCGID2 = %u LCGID3 = %u\n",
+                          rx_ces[i],
+                          UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0],
+                          UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1],
+                          UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2],
+                          UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID3]);
+
+                    if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID0] == 0 )
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0]=0;
+                    else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0] == 0)
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID0]=frameP;
+
+                    if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID1] == 0 )
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1]=0;
+                    else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1] == 0)
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID1]=frameP;
+
+                    if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID2] == 0 )
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2]=0;
+                    else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2] == 0)
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID2]=frameP;
+
+                    if (UE_list->UE_template[CC_idP][UE_id].bsr_info[LCGID3] == 0 )
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3]= 0;
+                    else if (UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3] == 0)
+                        UE_list->UE_template[CC_idP][UE_id].ul_buffer_creation_time[LCGID3]=frameP;
+
+                }
+                payload_ptr += 3;////sizeof(LONG_BSR);
+                break;
+            default:
+                LOG_E(MAC, "[eNB] Received unknown MAC header (0x%02x)\n", rx_ces[i]);
+                break;
+        }
     }
-  }
-  
-  for (i=0;i<num_sdu;i++) {
-    LOG_D(MAC,"SDU Number %d MAC Subheader SDU_LCID %d, length %d\n",i,rx_lcids[i],rx_lengths[i]);
-    
-    switch (rx_lcids[i]) {
-    case CCCH : 
-      LOG_I(MAC,"[eNB %d][RAPROC] Frame %d, Received CCCH:  %x.%x.%x.%x.%x.%x, Terminating RA procedure for UE rnti %x\n",
-	    enb_mod_idP,frameP,
-	    payload_ptr[0],payload_ptr[1],payload_ptr[2],payload_ptr[3],payload_ptr[4], payload_ptr[5], rntiP);
-
-      for (ii=0;ii<NB_RA_PROC_MAX;ii++) {
-	LOG_D(MAC,"[RAPROC] Checking proc %d : rnti (%x, %x), active %d\n",ii,
-	      eNB->common_channels[CC_idP].RA_template[ii].rnti, rntiP,
-	      eNB->common_channels[CC_idP].RA_template[ii].RA_active);
-	
-	if ((eNB->common_channels[CC_idP].RA_template[ii].rnti==rntiP) &&
-	    (eNB->common_channels[CC_idP].RA_template[ii].RA_active==TRUE)) {
-	  
-          //payload_ptr = parse_ulsch_header(msg3,&num_ce,&num_sdu,rx_ces,rx_lcids,rx_lengths,msg3_len);
-	  
-	  if (UE_id < 0) {
-	    memcpy(&eNB->common_channels[CC_idP].RA_template[ii].cont_res_id[0],payload_ptr,6);
-	    LOG_I(MAC,"[eNB %d][RAPROC] Frame %d CCCH: Received RRCConnectionRequest: length %d, offset %d\n",
-                  enb_mod_idP,frameP,rx_lengths[ii],payload_ptr-sduP);
-	    if ((UE_id=add_new_ue(enb_mod_idP,CC_idP,eNB->common_channels[CC_idP].RA_template[ii].rnti,harq_pidP)) == -1 )
-	      mac_xface->macphy_exit("[MAC][eNB] Max user count reached\n");
-	    else 
-	      LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Added user with rnti %x => UE %d\n",
-		    enb_mod_idP,frameP,eNB->common_channels[CC_idP].RA_template[ii].rnti,UE_id);
-	  } else {
-	    LOG_I(MAC,"[eNB %d][RAPROC] Frame %d CCCH: Received RRCConnectionReestablishment from UE %d: length %d, offset %d\n",
-		  enb_mod_idP,frameP,UE_id,rx_lengths[ii],payload_ptr-sduP);
-	  }
-	  
-	  if (Is_rrc_registered == 1)
-	    mac_rrc_data_ind(enb_mod_idP,frameP,CCCH,(uint8_t *)payload_ptr,rx_lengths[ii],1,enb_mod_idP,0);
-	  
-	  
-          if (num_ce >0) {  // handle msg3 which is not RRCConnectionRequest
-	    //	process_ra_message(msg3,num_ce,rx_lcids,rx_ces);
-	  }
-	  
-	  eNB->common_channels[CC_idP].RA_template[ii].generate_Msg4 = 1;
-	  eNB->common_channels[CC_idP].RA_template[ii].wait_ack_Msg4 = 0;
-	  
-	  
-	} // if process is active
-	
-      } // loop on RA processes
-      
-      break;
-    case  DCCH : 
-    case DCCH1 :
-      //      if(eNB_mac_inst[module_idP][CC_idP].Dcch_lchan[UE_id].Active==1){
-      
+
+    for (i=0;i<num_sdu;i++) {
+        LOG_D(MAC,"SDU Number %d MAC Subheader SDU_LCID %d, length %d\n",i,rx_lcids[i],rx_lengths[i]);
+
+        switch (rx_lcids[i]) {
+            case CCCH :
+                LOG_I(MAC,"[eNB %d][RAPROC] Frame %d, Received CCCH:  %x.%x.%x.%x.%x.%x, Terminating RA procedure for UE rnti %x\n",
+                      enb_mod_idP,frameP,
+                      payload_ptr[0],payload_ptr[1],payload_ptr[2],payload_ptr[3],payload_ptr[4], payload_ptr[5], rntiP);
+
+                for (ii=0;ii<NB_RA_PROC_MAX;ii++) {
+                    LOG_D(MAC,"[RAPROC] Checking proc %d : rnti (%x, %x), active %d\n",ii,
+                          eNB->common_channels[CC_idP].RA_template[ii].rnti, rntiP,
+                          eNB->common_channels[CC_idP].RA_template[ii].RA_active);
+
+                    if ((eNB->common_channels[CC_idP].RA_template[ii].rnti==rntiP) &&
+                                    (eNB->common_channels[CC_idP].RA_template[ii].RA_active==TRUE)) {
+
+                        //payload_ptr = parse_ulsch_header(msg3,&num_ce,&num_sdu,rx_ces,rx_lcids,rx_lengths,msg3_len);
+
+                        if (UE_id < 0) {
+                            memcpy(&eNB->common_channels[CC_idP].RA_template[ii].cont_res_id[0],payload_ptr,6);
+                            LOG_I(MAC,"[eNB %d][RAPROC] Frame %d CCCH: Received RRCConnectionRequest: length %d, offset %d\n",
+                                  enb_mod_idP,frameP,rx_lengths[ii],payload_ptr-sduP);
+                            if ((UE_id=add_new_ue(enb_mod_idP,CC_idP,eNB->common_channels[CC_idP].RA_template[ii].rnti,harq_pidP)) == -1 )
+                                mac_xface->macphy_exit("[MAC][eNB] Max user count reached\n");
+                            else
+                                LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Added user with rnti %x => UE %d\n",
+                                      enb_mod_idP,frameP,eNB->common_channels[CC_idP].RA_template[ii].rnti,UE_id);
+                        } else {
+                            LOG_I(MAC,"[eNB %d][RAPROC] Frame %d CCCH: Received RRCConnectionReestablishment from UE %d: length %d, offset %d\n",
+                                  enb_mod_idP,frameP,UE_id,rx_lengths[ii],payload_ptr-sduP);
+                        }
+
+                        if (Is_rrc_registered == 1)
+                            mac_rrc_data_ind(enb_mod_idP,frameP,CCCH,(uint8_t *)payload_ptr,rx_lengths[ii],1,enb_mod_idP,0);
+
+
+                        if (num_ce >0) {  // handle msg3 which is not RRCConnectionRequest
+                            //	process_ra_message(msg3,num_ce,rx_lcids,rx_ces);
+                        }
+
+                        eNB->common_channels[CC_idP].RA_template[ii].generate_Msg4 = 1;
+                        eNB->common_channels[CC_idP].RA_template[ii].wait_ack_Msg4 = 0;
+
+
+                    } // if process is active
+
+                } // loop on RA processes
+
+                break;
+            case  DCCH :
+            case DCCH1 :
+                //      if(eNB_mac_inst[module_idP][CC_idP].Dcch_lchan[UE_id].Active==1){
+
 #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
-      LOG_T(MAC,"offset: %d\n",(unsigned char)((unsigned char*)payload_ptr-sduP));
-      for (j=0;j<32;j++)
-	LOG_T(MAC,"%x ",payload_ptr[j]);
-      LOG_T(MAC,"\n");
+                LOG_T(MAC,"offset: %d\n",(unsigned char)((unsigned char*)payload_ptr-sduP));
+                for (j=0;j<32;j++)
+                    LOG_T(MAC,"%x ",payload_ptr[j]);
+                LOG_T(MAC,"\n");
 #endif
-      
-      //  This check is just to make sure we didn't get a bogus SDU length, to be removed ...
-      if (rx_lengths[i]<CCCH_PAYLOAD_SIZE_MAX) {
-	LOG_D(MAC,"[eNB %d] Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n",
-	      enb_mod_idP,frameP, rx_lengths[i], UE_id, rx_lcids[i]);
-	
-	mac_rlc_data_ind(enb_mod_idP,UE_id, frameP,ENB_FLAG_YES,MBMS_FLAG_NO,
-			 rx_lcids[i],
-			 (char *)payload_ptr,
-			 rx_lengths[i],
-			 1,
-			 NULL);//(unsigned int*)crc_status);
-	UE_list->eNB_UE_stats[CC_idP][UE_id].num_pdu_rx[rx_lcids[i]]+=1;
-	UE_list->eNB_UE_stats[CC_idP][UE_id].num_bytes_rx[rx_lcids[i]]+=rx_lengths[i];
-	
-      }
-      //      }
-      break;
-    case DTCH: // default DRB 
-      //      if(eNB_mac_inst[module_idP][CC_idP].Dcch_lchan[UE_id].Active==1){
-	
+
+                //  This check is just to make sure we didn't get a bogus SDU length, to be removed ...
+                if (rx_lengths[i]<CCCH_PAYLOAD_SIZE_MAX) {
+                    LOG_D(MAC,"[eNB %d] Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n",
+                          enb_mod_idP,frameP, rx_lengths[i], UE_id, rx_lcids[i]);
+
+                    mac_rlc_data_ind(enb_mod_idP,UE_id, frameP,ENB_FLAG_YES,MBMS_FLAG_NO,
+                                     rx_lcids[i],
+                                     (char *)payload_ptr,
+                                     rx_lengths[i],
+                                     1,
+                                     NULL);//(unsigned int*)crc_status);
+                    UE_list->eNB_UE_stats[CC_idP][UE_id].num_pdu_rx[rx_lcids[i]]+=1;
+                    UE_list->eNB_UE_stats[CC_idP][UE_id].num_bytes_rx[rx_lcids[i]]+=rx_lengths[i];
+
+                }
+                //      }
+                break;
+            case DTCH: // default DRB
+                //      if(eNB_mac_inst[module_idP][CC_idP].Dcch_lchan[UE_id].Active==1){
+
 #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
-      LOG_T(MAC,"offset: %d\n",(unsigned char)((unsigned char*)payload_ptr-sduP));
-      for (j=0;j<32;j++)
-	LOG_T(MAC,"%x ",payload_ptr[j]);
-      LOG_T(MAC,"\n");
+                LOG_T(MAC,"offset: %d\n",(unsigned char)((unsigned char*)payload_ptr-sduP));
+                for (j=0;j<32;j++)
+                    LOG_T(MAC,"%x ",payload_ptr[j]);
+                LOG_T(MAC,"\n");
 #endif
-      
-      LOG_D(MAC,"[eNB %d] Frame %d : ULSCH -> UL-DTCH, received %d bytes from UE %d for lcid %d\n",
-	    enb_mod_idP,frameP, rx_lengths[i], UE_id,rx_lcids[i]);
-      
-      if ((rx_lengths[i] <SCH_PAYLOAD_SIZE_MAX) &&  (rx_lengths[i] > 0) ) {   // MAX SIZE OF transport block
-	mac_rlc_data_ind(enb_mod_idP,UE_id, frameP,ENB_FLAG_YES,MBMS_FLAG_NO,
-			 DTCH,
-			 (char *)payload_ptr,
-			 rx_lengths[i],
-			 1,
-			 NULL);//(unsigned int*)crc_status);
-	UE_list->eNB_UE_stats[CC_idP][UE_id].num_pdu_rx[rx_lcids[i]]+=1;
-	UE_list->eNB_UE_stats[CC_idP][UE_id].num_bytes_rx[rx_lcids[i]]+=rx_lengths[i];
-      }
-      //      }
-      break;
-    default :  //if (rx_lcids[i] >= DTCH) {
-      UE_list->eNB_UE_stats[CC_idP][UE_id].num_errors_rx+=1;
-      LOG_E(MAC,"[eNB %d] Frame %d : received unsupported or unknown LCID %d from UE %d ", enb_mod_idP, frameP, rx_lcids[i], UE_id);
-      break;
+
+                LOG_D(MAC,"[eNB %d] Frame %d : ULSCH -> UL-DTCH, received %d bytes from UE %d for lcid %d\n",
+                      enb_mod_idP,frameP, rx_lengths[i], UE_id,rx_lcids[i]);
+
+                if ((rx_lengths[i] <SCH_PAYLOAD_SIZE_MAX) &&  (rx_lengths[i] > 0) ) {   // MAX SIZE OF transport block
+                    mac_rlc_data_ind(enb_mod_idP,UE_id, frameP,ENB_FLAG_YES,MBMS_FLAG_NO,
+                                     DTCH,
+                                     (char *)payload_ptr,
+                                     rx_lengths[i],
+                                     1,
+                                     NULL);//(unsigned int*)crc_status);
+                    UE_list->eNB_UE_stats[CC_idP][UE_id].num_pdu_rx[rx_lcids[i]]+=1;
+                    UE_list->eNB_UE_stats[CC_idP][UE_id].num_bytes_rx[rx_lcids[i]]+=rx_lengths[i];
+                }
+                //      }
+                break;
+            default :  //if (rx_lcids[i] >= DTCH) {
+                UE_list->eNB_UE_stats[CC_idP][UE_id].num_errors_rx+=1;
+                LOG_E(MAC,"[eNB %d] Frame %d : received unsupported or unknown LCID %d from UE %d ", enb_mod_idP, frameP, rx_lcids[i], UE_id);
+                break;
+        }
+        payload_ptr+=rx_lengths[i];
+
     }
-    payload_ptr+=rx_lengths[i];
-    
-  }  
-  /* NN--> FK: we could either check the payload, or use a phy helper to detect a false msg3 */
-  if ((num_sdu == 0) && (num_ce==0)){
-    UE_list->eNB_UE_stats[CC_idP][UE_id].total_num_errors_rx+=1;
-    if (msg3_flagP != NULL){
-      if( *msg3_flagP == 1 ) { 
-	LOG_N(MAC,"[eNB %d] frame %d : false msg3 detection: signal phy to canceling RA and remove the UE\n", enb_mod_idP, frameP);
-	*msg3_flagP=0;
-      }
+    /* NN--> FK: we could either check the payload, or use a phy helper to detect a false msg3 */
+    if ((num_sdu == 0) && (num_ce==0)){
+        UE_list->eNB_UE_stats[CC_idP][UE_id].total_num_errors_rx+=1;
+        if (msg3_flagP != NULL){
+            if( *msg3_flagP == 1 ) {
+                LOG_N(MAC,"[eNB %d] frame %d : false msg3 detection: signal phy to canceling RA and remove the UE\n", enb_mod_idP, frameP);
+                *msg3_flagP=0;
+            }
+        }
+    }else {
+        UE_list->eNB_UE_stats[CC_idP][UE_id].total_pdu_bytes_rx+=sdu_lenP;
+        UE_list->eNB_UE_stats[CC_idP][UE_id].total_num_pdus_rx+=1;
     }
-  }else {
-    UE_list->eNB_UE_stats[CC_idP][UE_id].total_pdu_bytes_rx+=sdu_lenP;
-    UE_list->eNB_UE_stats[CC_idP][UE_id].total_num_pdus_rx+=1;
-  }
-  vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU,0);
-  stop_meas(&eNB->rx_ulsch_sdu);
+    vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU,0);
+    stop_meas(&eNB->rx_ulsch_sdu);
 }
 
 
 uint32_t bytes_to_bsr_index(int32_t nbytes) {
 
-  uint32_t i=0;
+    uint32_t i=0;
 
-  if (nbytes<0)
-    return(0);
+    if (nbytes<0)
+        return(0);
 
-  while ((i<BSR_TABLE_SIZE)&&
-	 (BSR_TABLE[i]<=nbytes)){
-    i++;
-  }
-  return(i-1);
+    while ((i<BSR_TABLE_SIZE)&&
+                    (BSR_TABLE[i]<=nbytes)){
+        i++;
+    }
+    return(i-1);
 }
 
 void adjust_bsr_info(int buffer_occupancy, 
-		     uint16_t TBS, 
-		     UE_TEMPLATE *UE_template){
-
-  uint32_t         tmp_bsr;
-
-  // could not serve all the uplink traffic 
-  if (buffer_occupancy > 0 ) { 
-    if (BSR_TABLE[UE_template->bsr_info[LCGID0]] <=  TBS ) {
-      tmp_bsr = BSR_TABLE[UE_template->bsr_info[LCGID0]]; // serving this amout of  bytes
-      UE_template->bsr_info[LCGID0] = 0;
-      if (BSR_TABLE[UE_template->bsr_info[LCGID1]] <= (TBS-tmp_bsr)) {
-	tmp_bsr += BSR_TABLE[UE_template->bsr_info[LCGID1]];
-	UE_template->bsr_info[LCGID1] = 0;
-	if (BSR_TABLE[UE_template->bsr_info[LCGID2]] <= (TBS-tmp_bsr)) {
-	  tmp_bsr += BSR_TABLE[UE_template->bsr_info[LCGID2]];
-	  UE_template->bsr_info[LCGID2] = 0;
-	  if (BSR_TABLE[UE_template->bsr_info[LCGID3]] <= (TBS-tmp_bsr)) {
-	    tmp_bsr += BSR_TABLE[UE_template->bsr_info[LCGID3]];
-	    UE_template->bsr_info[LCGID3] = 0;
-	  } else {
-	    UE_template->bsr_info[LCGID3] = bytes_to_bsr_index((int32_t)BSR_TABLE[UE_template->bsr_info[LCGID3]] - ((int32_t) TBS - (int32_t)tmp_bsr));
-	  }
-	}
-	else {
-	  UE_template->bsr_info[LCGID2] = bytes_to_bsr_index((int32_t)BSR_TABLE[UE_template->bsr_info[LCGID2]] - ((int32_t)TBS - (int32_t)tmp_bsr));
-	}
-      }
-      else {
-	UE_template->bsr_info[LCGID1] = bytes_to_bsr_index((int32_t)BSR_TABLE[UE_template->bsr_info[LCGID1]] - ((int32_t)TBS - (int32_t)tmp_bsr));
-      }
+                     uint16_t TBS,
+                     UE_TEMPLATE *UE_template){
+
+    uint32_t         tmp_bsr;
+
+    // could not serve all the uplink traffic
+    if (buffer_occupancy > 0 ) {
+        if (BSR_TABLE[UE_template->bsr_info[LCGID0]] <=  TBS ) {
+            tmp_bsr = BSR_TABLE[UE_template->bsr_info[LCGID0]]; // serving this amout of  bytes
+            UE_template->bsr_info[LCGID0] = 0;
+            if (BSR_TABLE[UE_template->bsr_info[LCGID1]] <= (TBS-tmp_bsr)) {
+                tmp_bsr += BSR_TABLE[UE_template->bsr_info[LCGID1]];
+                UE_template->bsr_info[LCGID1] = 0;
+                if (BSR_TABLE[UE_template->bsr_info[LCGID2]] <= (TBS-tmp_bsr)) {
+                    tmp_bsr += BSR_TABLE[UE_template->bsr_info[LCGID2]];
+                    UE_template->bsr_info[LCGID2] = 0;
+                    if (BSR_TABLE[UE_template->bsr_info[LCGID3]] <= (TBS-tmp_bsr)) {
+                        tmp_bsr += BSR_TABLE[UE_template->bsr_info[LCGID3]];
+                        UE_template->bsr_info[LCGID3] = 0;
+                    } else {
+                        UE_template->bsr_info[LCGID3] = bytes_to_bsr_index((int32_t)BSR_TABLE[UE_template->bsr_info[LCGID3]] - ((int32_t) TBS - (int32_t)tmp_bsr));
+                    }
+                }
+                else {
+                    UE_template->bsr_info[LCGID2] = bytes_to_bsr_index((int32_t)BSR_TABLE[UE_template->bsr_info[LCGID2]] - ((int32_t)TBS - (int32_t)tmp_bsr));
+                }
+            }
+            else {
+                UE_template->bsr_info[LCGID1] = bytes_to_bsr_index((int32_t)BSR_TABLE[UE_template->bsr_info[LCGID1]] - ((int32_t)TBS - (int32_t)tmp_bsr));
+            }
+        }
+        else {
+            UE_template->bsr_info[LCGID0] = bytes_to_bsr_index((int32_t)BSR_TABLE[UE_template->bsr_info[LCGID0]] - (int32_t)TBS);
+        }
     }
-    else {
-      UE_template->bsr_info[LCGID0] = bytes_to_bsr_index((int32_t)BSR_TABLE[UE_template->bsr_info[LCGID0]] - (int32_t)TBS);
+    else {  // we have flushed all buffers so clear bsr
+        UE_template->bsr_info[LCGID0] = 0;
+        UE_template->bsr_info[LCGID1] = 0;
+        UE_template->bsr_info[LCGID2] = 0;
+        UE_template->bsr_info[LCGID3] = 0;
     }
-  }
-  else {  // we have flushed all buffers so clear bsr
-    UE_template->bsr_info[LCGID0] = 0;
-    UE_template->bsr_info[LCGID1] = 0;
-    UE_template->bsr_info[LCGID2] = 0;
-    UE_template->bsr_info[LCGID3] = 0;
-  }
 
 
 }
 
 void add_ue_ulsch_info(module_id_t module_idP, int CC_id, int UE_id, sub_frame_t subframeP, UE_ULSCH_STATUS status){
 
-  eNB_ulsch_info[module_idP][CC_id][UE_id].rnti             = UE_RNTI(module_idP,UE_id);
-  eNB_ulsch_info[module_idP][CC_id][UE_id].subframe         = subframeP;
-  eNB_ulsch_info[module_idP][CC_id][UE_id].status           = status;
+    eNB_ulsch_info[module_idP][CC_id][UE_id].rnti             = UE_RNTI(module_idP,UE_id);
+    eNB_ulsch_info[module_idP][CC_id][UE_id].subframe         = subframeP;
+    eNB_ulsch_info[module_idP][CC_id][UE_id].status           = status;
 
-  eNB_ulsch_info[module_idP][CC_id][UE_id].serving_num++;
+    eNB_ulsch_info[module_idP][CC_id][UE_id].serving_num++;
 
 }
 
@@ -416,130 +416,130 @@ int schedule_next_ulue(module_id_t module_idP, int UE_id, sub_frame_t subframeP)
   return next_ue;
 
 }
-*/
+ */
 
 
 
 
 
 unsigned char *parse_ulsch_header(unsigned char *mac_header,
-				  unsigned char *num_ce,
-				  unsigned char *num_sdu,
-				  unsigned char *rx_ces,
-				  unsigned char *rx_lcids,
-				  unsigned short *rx_lengths,
-				  unsigned short tb_length) {
-
-  unsigned char not_done=1,num_ces=0,num_sdus=0,lcid,num_sdu_cnt;
-  unsigned char *mac_header_ptr = mac_header;
-  unsigned short length, ce_len=0;
-
-  while (not_done==1) {
-
-    if (((SCH_SUBHEADER_FIXED *)mac_header_ptr)->E == 0)
-      not_done = 0;
-
-    lcid = ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->LCID;
-    if (lcid < EXTENDED_POWER_HEADROOM) {
-      if (not_done==0) { // last MAC SDU, length is implicit
-	mac_header_ptr++;
-	length = tb_length-(mac_header_ptr-mac_header)-ce_len;
-	for (num_sdu_cnt=0; num_sdu_cnt < num_sdus ; num_sdu_cnt++)
-	  length -= rx_lengths[num_sdu_cnt];
-      }
-      else {
-	if (((SCH_SUBHEADER_SHORT *)mac_header_ptr)->F == 0) {
-	  length = ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->L;
-	  mac_header_ptr += 2;//sizeof(SCH_SUBHEADER_SHORT);
-	}
-	else { // F = 1
-	  length = ((((SCH_SUBHEADER_LONG *)mac_header_ptr)->L_MSB & 0x7f ) << 8 ) | (((SCH_SUBHEADER_LONG *)mac_header_ptr)->L_LSB & 0xff);
-	  mac_header_ptr += 3;//sizeof(SCH_SUBHEADER_LONG);
-	}
-      }
-      LOG_D(MAC,"[eNB] sdu %d lcid %d tb_length %d length %d (offset now %d)\n",
-	    num_sdus,lcid,tb_length, length,mac_header_ptr-mac_header);
-      rx_lcids[num_sdus] = lcid;
-      rx_lengths[num_sdus] = length;
-      num_sdus++;
-    }
-    else {  // This is a control element subheader POWER_HEADROOM, BSR and CRNTI
-      if (lcid == SHORT_PADDING) {
-	mac_header_ptr++;
-      }
-      else {
-	rx_ces[num_ces] = lcid;
-	num_ces++;
-	mac_header_ptr++;
-	if (lcid==LONG_BSR)
-	  ce_len+=3;
-	else if (lcid==CRNTI)
-	  ce_len+=2;
-	else if ((lcid==POWER_HEADROOM) || (lcid==TRUNCATED_BSR)|| (lcid== SHORT_BSR))
-	  ce_len++;
-	else {
-	  LOG_E(MAC,"unknown CE %d \n", lcid);
-	  mac_xface->macphy_exit("unknown CE");
-	}
-      }
+                                  unsigned char *num_ce,
+                                  unsigned char *num_sdu,
+                                  unsigned char *rx_ces,
+                                  unsigned char *rx_lcids,
+                                  unsigned short *rx_lengths,
+                                  unsigned short tb_length) {
+
+    unsigned char not_done=1,num_ces=0,num_sdus=0,lcid,num_sdu_cnt;
+    unsigned char *mac_header_ptr = mac_header;
+    unsigned short length, ce_len=0;
+
+    while (not_done==1) {
+
+        if (((SCH_SUBHEADER_FIXED *)mac_header_ptr)->E == 0)
+            not_done = 0;
+
+        lcid = ((SCH_SUBHEADER_FIXED *)mac_header_ptr)->LCID;
+        if (lcid < EXTENDED_POWER_HEADROOM) {
+            if (not_done==0) { // last MAC SDU, length is implicit
+                mac_header_ptr++;
+                length = tb_length-(mac_header_ptr-mac_header)-ce_len;
+                for (num_sdu_cnt=0; num_sdu_cnt < num_sdus ; num_sdu_cnt++)
+                    length -= rx_lengths[num_sdu_cnt];
+            }
+            else {
+                if (((SCH_SUBHEADER_SHORT *)mac_header_ptr)->F == 0) {
+                    length = ((SCH_SUBHEADER_SHORT *)mac_header_ptr)->L;
+                    mac_header_ptr += 2;//sizeof(SCH_SUBHEADER_SHORT);
+                }
+                else { // F = 1
+                    length = ((((SCH_SUBHEADER_LONG *)mac_header_ptr)->L_MSB & 0x7f ) << 8 ) | (((SCH_SUBHEADER_LONG *)mac_header_ptr)->L_LSB & 0xff);
+                    mac_header_ptr += 3;//sizeof(SCH_SUBHEADER_LONG);
+                }
+            }
+            LOG_D(MAC,"[eNB] sdu %d lcid %d tb_length %d length %d (offset now %d)\n",
+                  num_sdus,lcid,tb_length, length,mac_header_ptr-mac_header);
+            rx_lcids[num_sdus] = lcid;
+            rx_lengths[num_sdus] = length;
+            num_sdus++;
+        }
+        else {  // This is a control element subheader POWER_HEADROOM, BSR and CRNTI
+            if (lcid == SHORT_PADDING) {
+                mac_header_ptr++;
+            }
+            else {
+                rx_ces[num_ces] = lcid;
+                num_ces++;
+                mac_header_ptr++;
+                if (lcid==LONG_BSR)
+                    ce_len+=3;
+                else if (lcid==CRNTI)
+                    ce_len+=2;
+                else if ((lcid==POWER_HEADROOM) || (lcid==TRUNCATED_BSR)|| (lcid== SHORT_BSR))
+                    ce_len++;
+                else {
+                    LOG_E(MAC,"unknown CE %d \n", lcid);
+                    mac_xface->macphy_exit("unknown CE");
+                }
+            }
+        }
     }
-  }
-  *num_ce = num_ces;
-  *num_sdu = num_sdus;
+    *num_ce = num_ces;
+    *num_sdu = num_sdus;
 
-  return(mac_header_ptr);
+    return(mac_header_ptr);
 }
 
 
 void schedule_ulsch(module_id_t module_idP, frame_t frameP,unsigned char cooperation_flag,sub_frame_t subframeP, unsigned char sched_subframe,
-		     unsigned int *nCCE) {//,int calibration_flag) {
-
-
-  unsigned int nCCE_available[MAX_NUM_CCs];
-  uint16_t first_rb[MAX_NUM_CCs],i;
-  int CC_id;
-  eNB_MAC_INST *eNB=&eNB_mac_inst[module_idP];
-
-  start_meas(&eNB->schedule_ulsch);
-
-
-  for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
-    
-    first_rb[CC_id] = 1;
-    nCCE_available[CC_id] = mac_xface->get_nCCE_max(module_idP,CC_id) - nCCE[CC_id];
-    
-    // UE data info;
-    // check which UE has data to transmit
-    // function to decide the scheduling
-    // e.g. scheduling_rslt = Greedy(granted_UEs, nb_RB)
-    
-    // default function for default scheduling
-    //
-    
-    // output of scheduling, the UE numbers in RBs, where it is in the code???
-    // check if RA (Msg3) is active in this subframeP, if so skip the PRBs used for Msg3
-    // Msg3 is using 1 PRB so we need to increase first_rb accordingly
-    // not sure about the break (can there be more than 1 active RA procedure?)
-    
-    for (i=0;i<NB_RA_PROC_MAX;i++) {
-      if ((eNB->common_channels[CC_id].RA_template[i].RA_active == TRUE) &&
-          (eNB->common_channels[CC_id].RA_template[i].generate_rar == 0) &&
-          (eNB->common_channels[CC_id].RA_template[i].Msg3_subframe == sched_subframe)) {
-	first_rb[CC_id]++;
-	break;
-      }
+                    unsigned int *nCCE) {//,int calibration_flag) {
+
+
+    unsigned int nCCE_available[MAX_NUM_CCs];
+    uint16_t first_rb[MAX_NUM_CCs],i;
+    int CC_id;
+    eNB_MAC_INST *eNB=&eNB_mac_inst[module_idP];
+
+    start_meas(&eNB->schedule_ulsch);
+
+
+    for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
+
+        first_rb[CC_id] = 1;
+        nCCE_available[CC_id] = mac_xface->get_nCCE_max(module_idP,CC_id) - nCCE[CC_id];
+
+        // UE data info;
+        // check which UE has data to transmit
+        // function to decide the scheduling
+        // e.g. scheduling_rslt = Greedy(granted_UEs, nb_RB)
+
+        // default function for default scheduling
+        //
+
+        // output of scheduling, the UE numbers in RBs, where it is in the code???
+        // check if RA (Msg3) is active in this subframeP, if so skip the PRBs used for Msg3
+        // Msg3 is using 1 PRB so we need to increase first_rb accordingly
+        // not sure about the break (can there be more than 1 active RA procedure?)
+
+        for (i=0;i<NB_RA_PROC_MAX;i++) {
+            if ((eNB->common_channels[CC_id].RA_template[i].RA_active == TRUE) &&
+                            (eNB->common_channels[CC_id].RA_template[i].generate_rar == 0) &&
+                            (eNB->common_channels[CC_id].RA_template[i].Msg3_subframe == sched_subframe)) {
+                first_rb[CC_id]++;
+                break;
+            }
+        }
     }
-  }   
 
-  schedule_ulsch_rnti(module_idP, cooperation_flag, frameP, subframeP, sched_subframe, nCCE, nCCE_available, first_rb);
-    
+    schedule_ulsch_rnti(module_idP, cooperation_flag, frameP, subframeP, sched_subframe, nCCE, nCCE_available, first_rb);
+
 #ifdef CBA
-  schedule_ulsch_cba_rnti(module_idP, cooperation_flag, frameP, subframeP, sched_subframe, nCCE, nCCE_available, first_rb);
+    schedule_ulsch_cba_rnti(module_idP, cooperation_flag, frameP, subframeP, sched_subframe, nCCE, nCCE_available, first_rb);
 #endif
 
 
-  stop_meas(&eNB->schedule_ulsch);
-  
+    stop_meas(&eNB->schedule_ulsch);
+
 }
 
 
@@ -553,534 +553,534 @@ void schedule_ulsch_rnti(module_id_t   module_idP,
                          unsigned int *nCCE_available,
                          uint16_t     *first_rb){
 
-  int                UE_id;
-  uint8_t            aggregation    = 2;
-  rnti_t             rnti           = -1;
-  uint8_t            round          = 0;
-  uint8_t            harq_pid       = 0;
-  void              *ULSCH_dci      = NULL;
-  LTE_eNB_UE_stats  *eNB_UE_stats   = NULL;
-  DCI_PDU           *DCI_pdu; 
-  uint8_t                 status         = 0;
-  uint8_t                 rb_table_index = -1;
-  uint16_t                TBS,i;
-  int32_t                buffer_occupancy=0;
-  uint32_t                cqi_req,cshift,ndi,mcs,rballoc,tpc;
-  int32_t                 normalized_rx_power, target_rx_power=-90;
-  static int32_t          tpc_accumulated=0;
-
-  int n,CC_id;
-  eNB_MAC_INST      *eNB=&eNB_mac_inst[module_idP];
-  UE_list_t         *UE_list=&eNB->UE_list;
-  UE_TEMPLATE       *UE_template;
-  int                rvidx_tab[4] = {0,2,3,1};
-  LTE_DL_FRAME_PARMS   *frame_parms;
-
-
-  //  LOG_I(MAC,"entering ulsch preprocesor\n");
-
-  ulsch_scheduler_pre_processor(module_idP,
-				frameP,
-				subframeP,
-				first_rb,
-				aggregation,
-				nCCE);
-
-  //  LOG_I(MAC,"exiting ulsch preprocesor\n");
-
-  // loop over all active UEs
-  for (UE_id=UE_list->head_ul;UE_id>=0;UE_id=UE_list->next_ul[UE_id]) {
-
-    // don't schedule if Msg4 is not received yet
-    if (UE_list->UE_template[UE_PCCID(module_idP,UE_id)][UE_id].configured==FALSE)
-      continue;
-
-    rnti = UE_RNTI(module_idP,UE_id); 
-    if (rnti==0) {
-      LOG_W(MAC,"[eNB %d] frame %d subfarme %d, UE %d CC %d: no RNTI \n", module_idP,frameP,subframeP,UE_id,CC_id);
-      continue;
-    }
-    
-    // loop over all active UL CC_ids for this UE
-    for (n=0;n<UE_list->numactiveULCCs[UE_id];n++) {
-      // This is the actual CC_id in the list
-      CC_id = UE_list->ordered_ULCCids[n][UE_id];
-      frame_parms = mac_xface->get_lte_frame_parms(module_idP,CC_id); 
-      eNB_UE_stats = mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti);
-      if (eNB_UE_stats==NULL){
-	LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d CC %d: no PHY context\n", module_idP,frameP,subframeP,UE_id,CC_id);
-	continue; // mac_xface->macphy_exit("[MAC][eNB] Cannot find eNB_UE_stats\n");
-      }
-      if (nCCE_available[CC_id] < (1<<aggregation)){
-	LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d CC %d: not enough nCCE (%d)\n", module_idP,frameP,subframeP,UE_id,CC_id,nCCE_available[CC_id]);
-	continue; // break;
-      }
-	
-
-      if (eNB_UE_stats->mode == PUSCH) { // ue has a ulsch channel
-            
-	DCI_pdu = &eNB->common_channels[CC_id].DCI_pdu;
-	UE_template = &UE_list->UE_template[CC_id][UE_id];
-	
-	if (mac_xface->get_ue_active_harq_pid(module_idP,CC_id,rnti,frameP,subframeP,&harq_pid,&round,1) == -1 ){
-	  LOG_W(MAC,"[eNB %d] Scheduler Frame %d, subframeP: candidate harq_pid from PHY for UE %d CC %d RNTI %x\n",
-		module_idP,frameP,subframeP, UE_id, CC_id, rnti);
-	  //  NN --> RK: Don't schedule UE if we cannot get harq pid  
-	  //should we continue or set harq_pid to 0?
-	  continue;
-	}else 
-	  LOG_T(MAC,"[eNB %d] Frame %d, subframeP %d, UE %d CC %d : got harq pid %d  round %d (nCCE %d, rnti %x,mode %s)\n",
-		module_idP,frameP,subframeP,UE_id,CC_id, harq_pid, round,nCCE[CC_id],rnti,mode_string[eNB_UE_stats->mode]);
-       
+    int                UE_id;
+    uint8_t            aggregation    = 2;
+    rnti_t             rnti           = -1;
+    uint8_t            round          = 0;
+    uint8_t            harq_pid       = 0;
+    void              *ULSCH_dci      = NULL;
+    LTE_eNB_UE_stats  *eNB_UE_stats   = NULL;
+    DCI_PDU           *DCI_pdu;
+    uint8_t                 status         = 0;
+    uint8_t                 rb_table_index = -1;
+    uint16_t                TBS,i;
+    int32_t                buffer_occupancy=0;
+    uint32_t                cqi_req,cshift,ndi,mcs,rballoc,tpc;
+    int32_t                 normalized_rx_power, target_rx_power=-90;
+    static int32_t          tpc_accumulated=0;
+
+    int n,CC_id;
+    eNB_MAC_INST      *eNB=&eNB_mac_inst[module_idP];
+    UE_list_t         *UE_list=&eNB->UE_list;
+    UE_TEMPLATE       *UE_template;
+    int                rvidx_tab[4] = {0,2,3,1};
+    LTE_DL_FRAME_PARMS   *frame_parms;
+
+
+    //  LOG_I(MAC,"entering ulsch preprocesor\n");
+
+    ulsch_scheduler_pre_processor(module_idP,
+                                  frameP,
+                                  subframeP,
+                                  first_rb,
+                                  aggregation,
+                                  nCCE);
+
+    //  LOG_I(MAC,"exiting ulsch preprocesor\n");
+
+    // loop over all active UEs
+    for (UE_id=UE_list->head_ul;UE_id>=0;UE_id=UE_list->next_ul[UE_id]) {
+
+        // don't schedule if Msg4 is not received yet
+        if (UE_list->UE_template[UE_PCCID(module_idP,UE_id)][UE_id].configured==FALSE)
+            continue;
+
+        rnti = UE_RNTI(module_idP,UE_id);
+        if (rnti==0) {
+            LOG_W(MAC,"[eNB %d] frame %d subfarme %d, UE %d CC %d: no RNTI \n", module_idP,frameP,subframeP,UE_id,CC_id);
+            continue;
+        }
+
+        // loop over all active UL CC_ids for this UE
+        for (n=0;n<UE_list->numactiveULCCs[UE_id];n++) {
+            // This is the actual CC_id in the list
+            CC_id = UE_list->ordered_ULCCids[n][UE_id];
+            frame_parms = mac_xface->get_lte_frame_parms(module_idP,CC_id);
+            eNB_UE_stats = mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti);
+            if (eNB_UE_stats==NULL){
+                LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d CC %d: no PHY context\n", module_idP,frameP,subframeP,UE_id,CC_id);
+                continue; // mac_xface->macphy_exit("[MAC][eNB] Cannot find eNB_UE_stats\n");
+            }
+            if (nCCE_available[CC_id] < (1<<aggregation)){
+                LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d CC %d: not enough nCCE (%d)\n", module_idP,frameP,subframeP,UE_id,CC_id,nCCE_available[CC_id]);
+                continue; // break;
+            }
+
+
+            if (eNB_UE_stats->mode == PUSCH) { // ue has a ulsch channel
+
+                DCI_pdu = &eNB->common_channels[CC_id].DCI_pdu;
+                UE_template = &UE_list->UE_template[CC_id][UE_id];
+
+                if (mac_xface->get_ue_active_harq_pid(module_idP,CC_id,rnti,frameP,subframeP,&harq_pid,&round,1) == -1 ){
+                    LOG_W(MAC,"[eNB %d] Scheduler Frame %d, subframeP: candidate harq_pid from PHY for UE %d CC %d RNTI %x\n",
+                          module_idP,frameP,subframeP, UE_id, CC_id, rnti);
+                    //  NN --> RK: Don't schedule UE if we cannot get harq pid
+                    //should we continue or set harq_pid to 0?
+                    continue;
+                }else
+                    LOG_T(MAC,"[eNB %d] Frame %d, subframeP %d, UE %d CC %d : got harq pid %d  round %d (nCCE %d, rnti %x,mode %s)\n",
+                          module_idP,frameP,subframeP,UE_id,CC_id, harq_pid, round,nCCE[CC_id],rnti,mode_string[eNB_UE_stats->mode]);
+
 
 
 #ifndef EXMIMO_IOT
-	if (((UE_is_to_be_scheduled(module_idP,CC_id,UE_id)>0)) || (round>0) || ((frameP%10)==0)) 
-	  // if there is information on bsr of DCCH, DTCH or if there is UL_SR, or if there is a packet to retransmit, or we want to schedule a periodic feedback every 10 frames
+                if (((UE_is_to_be_scheduled(module_idP,CC_id,UE_id)>0)) || (round>0) || ((frameP%10)==0))
+                    // if there is information on bsr of DCCH, DTCH or if there is UL_SR, or if there is a packet to retransmit, or we want to schedule a periodic feedback every 10 frames
 #else
-	  if (round==0)
+                    if (round==0)
 #endif
-	    {
-	      // reset the scheduling request
-	      UE_template->ul_SR = 0;
-	      aggregation = process_ue_cqi(module_idP,UE_id); // =2 by default!!
-	      status = mac_get_rrc_status(module_idP,1,UE_id);
-	      cqi_req = (status < RRC_CONNECTED)? 0:1;
-
-	      //power control
-	      //compute the expected ULSCH RX power (for the stats)
-
-	      // this is the normalized RX power and this should be constant (regardless of mcs
-	      normalized_rx_power = eNB_UE_stats->UL_rssi[0];   
-	      target_rx_power = mac_xface->get_target_ul_rx_power(module_idP,CC_id);
-	      // this assumes accumulated tpc
-	      if (subframeP==0) {
-		if (normalized_rx_power>(target_rx_power+1)) {
-		  tpc = 0; //-1
-		  tpc_accumulated--;
-		}
-		else if (normalized_rx_power<(target_rx_power-1)) {
-		  tpc = 2; //+1
-		  tpc_accumulated++;
-		}
-		else 
-		  tpc = 1; //0
-	      }
-	      else 
-		tpc = 1; //0
-
-	      LOG_D(MAC,"[eNB %d] ULSCH scheduler: subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d\n",module_idP,subframeP,harq_pid,tpc,tpc_accumulated,normalized_rx_power,target_rx_power);
- 
-	      	      
-	      // new transmission 
-	      if (round==0) {
-		
-		ndi = 1-UE_template->oldNDI_UL[harq_pid];
-		UE_template->oldNDI_UL[harq_pid]=ndi;
-		//mcs = 10;
-		UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=UE_template->pre_assigned_mcs_ul;
-		mcs = cmin (UE_template->pre_assigned_mcs_ul, openair_daq_vars.target_ue_ul_mcs); // adjust, based on user-defined MCS
-		if (UE_template->pre_allocated_rb_table_index_ul >=0)
-		  rb_table_index=UE_template->pre_allocated_rb_table_index_ul;
-		else {
-		  mcs=10;rb_table_index=5; // for PHR
-		}
-		UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=mcs;
-		buffer_occupancy = UE_template->ul_total_buffer;
-		
-		while ((rb_table[rb_table_index]>(frame_parms->N_RB_UL-1-first_rb[CC_id])) && 
-		       (rb_table_index>0)) {
-		  rb_table_index--;
-		}
-		TBS = mac_xface->get_TBS_UL(mcs,rb_table[rb_table_index]);
-		buffer_occupancy -= TBS;
-		rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
-						first_rb[CC_id],
-						rb_table[rb_table_index]);
-		// increment for next UE allocation
-		first_rb[CC_id]+=rb_table[rb_table_index];  
-		//store for possible retransmission
-		UE_template->nb_rb_ul[harq_pid] = rb_table[rb_table_index]; 
-		
-		LOG_D(MAC,"[eNB %d][PUSCH %d/%x] Frame %d subframeP %d Scheduled UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d)\n",
-		      module_idP,harq_pid,rnti,frameP,subframeP,UE_id,mcs,
-		      first_rb[CC_id],rb_table[rb_table_index],
-		      rb_table_index,TBS,harq_pid);
-		// Adjust BSR entries for LCGIDs 
-		adjust_bsr_info(buffer_occupancy, 
-				TBS, 
-				UE_template);		  
-	
-	      } 
-	      else if (round > 0) { //we schedule a retransmission
-		
-		ndi = UE_template->oldNDI_UL[harq_pid];
-		if ((round&3)==0)
-		  mcs = openair_daq_vars.target_ue_ul_mcs;
-		else
-		  mcs = rvidx_tab[round&3] + 28; //not correct for round==4!
-	     
-		
-		LOG_D(MAC,"[eNB %d][PUSCH %d/%x] Frame %d subframeP %d Scheduled UE retransmission (mcs %d, first rb %d, nb_rb %d, TBS %d, harq_pid %d, round %d)\n",
-		      module_idP,UE_id,rnti,frameP,subframeP,mcs,
-		      first_rb[CC_id],UE_template->nb_rb_ul[harq_pid],
-		      TBS,//mac_xface->get_TBS_UL(mcs,UE_template->nb_rb_ul[harq_pid]),
-		      harq_pid, round);
-		
-		rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
-						first_rb[CC_id],
-						UE_template->nb_rb_ul[harq_pid]);
-		first_rb[CC_id]+=UE_template->nb_rb_ul[harq_pid];  // increment for next UE allocation
-	      }
-	      
-	      // Cyclic shift for DM RS
-	      if(cooperation_flag == 2) {
-		if(UE_id == 1)// For Distriibuted Alamouti, cyclic shift applied to 2nd UE
-		  cshift = 1;
-		else
-		  cshift = 0;
-	      }
-	      else
-		cshift = 0;// values from 0 to 7 can be used for mapping the cyclic shift (36.211 , Table 5.5.2.1.1-1)
-
-	      if (frame_parms->frame_type == TDD) {
-		switch (frame_parms->N_RB_UL) {
-		case 6:
-		  ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
-
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
-		  ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
-
-		  add_ue_spec_dci(DCI_pdu,
-				  ULSCH_dci,
-				  rnti,
-				  sizeof(DCI0_1_5MHz_TDD_1_6_t),
-				  aggregation,
-				  sizeof_DCI0_1_5MHz_TDD_1_6_t,
-				  format0,
-				  0);
-		  break;
-		default:
-		case 25:
-		  ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
-
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
-		  ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
-
-		  add_ue_spec_dci(DCI_pdu,
-				  ULSCH_dci,
-				  rnti,
-				  sizeof(DCI0_5MHz_TDD_1_6_t),
-				  aggregation,
-				  sizeof_DCI0_5MHz_TDD_1_6_t,
-				  format0,
-				  0);
-		  break;
-		case 50:
-		  ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
-
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
-
-		  add_ue_spec_dci(DCI_pdu,
-				  ULSCH_dci,
-				  rnti,
-				  sizeof(DCI0_10MHz_TDD_1_6_t),
-				  aggregation,
-				  sizeof_DCI0_10MHz_TDD_1_6_t,
-				  format0,
-				  0);
-		  break;
-		case 100:
-		  ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
-
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
-		  ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
-		  ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
-
-		  add_ue_spec_dci(DCI_pdu,
-				  ULSCH_dci,
-				  rnti,
-				  sizeof(DCI0_20MHz_TDD_1_6_t),
-				  aggregation,
-				  sizeof_DCI0_20MHz_TDD_1_6_t,
-				  format0,
-				  0);
-		  break;
-		}
-	      } // TDD
-	      else { //FDD
-		switch (frame_parms->N_RB_UL) {
-		case 25:
-		default:
-
-		  ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
-
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->type     = 0;
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->padding  = 0;
-		  ((DCI0_5MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
-
-		  add_ue_spec_dci(DCI_pdu,
-				  ULSCH_dci,
-				  rnti,
-				  sizeof(DCI0_5MHz_FDD_t),
-				  aggregation,
-				  sizeof_DCI0_5MHz_FDD_t,
-				  format0,
-				  0);
-		  break;
-		case 6:
-		  ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
-
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->type     = 0;
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->padding  = 0;
-		  ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
-
-		  add_ue_spec_dci(DCI_pdu,
-				  ULSCH_dci,
-				  rnti,
-				  sizeof(DCI0_1_5MHz_FDD_t),
-				  aggregation,
-				  sizeof_DCI0_1_5MHz_FDD_t,
-				  format0,
-				  0);
-		  break;
-		case 50:
-		  ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
-
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->type     = 0;
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->padding  = 0;
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
-		  ((DCI0_10MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
-
-		  add_ue_spec_dci(DCI_pdu,
-				  ULSCH_dci,
-				  rnti,
-				  sizeof(DCI0_10MHz_FDD_t),
-				  aggregation,
-				  sizeof_DCI0_10MHz_FDD_t,
-				  format0,
-				  0);
-		  break;
-		case 100:
-		  ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
-
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->type     = 0;
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->padding  = 0;
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
-		  ((DCI0_20MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
-
-		  add_ue_spec_dci(DCI_pdu,
-				  ULSCH_dci,
-				  rnti,
-				  sizeof(DCI0_20MHz_FDD_t),
-				  aggregation,
-				  sizeof_DCI0_20MHz_FDD_t,
-				  format0,
-				  0);
-		  break;
-
-		}
-	      }
-
-	      add_ue_ulsch_info(module_idP,
-				CC_id,
-				UE_id,
-				subframeP,
-				S_UL_SCHEDULED);
-
-	      nCCE[CC_id] = nCCE[CC_id] + (1<<aggregation);
-	      nCCE_available[CC_id] = mac_xface->get_nCCE_max(module_idP,CC_id) - nCCE[CC_id];
-	      
-	      LOG_D(MAC,"[eNB %d] Frame %d, subframeP %d: Generated ULSCH DCI for next UE_id %d, format 0\n", module_idP,frameP,subframeP,UE_id);
+                    {
+                        // reset the scheduling request
+                        UE_template->ul_SR = 0;
+                        aggregation = process_ue_cqi(module_idP,UE_id); // =2 by default!!
+                        status = mac_get_rrc_status(module_idP,1,UE_id);
+                        cqi_req = (status < RRC_CONNECTED)? 0:1;
+
+                        //power control
+                        //compute the expected ULSCH RX power (for the stats)
+
+                        // this is the normalized RX power and this should be constant (regardless of mcs
+                        normalized_rx_power = eNB_UE_stats->UL_rssi[0];
+                        target_rx_power = mac_xface->get_target_ul_rx_power(module_idP,CC_id);
+                        // this assumes accumulated tpc
+                        if (subframeP==0) {
+                            if (normalized_rx_power>(target_rx_power+1)) {
+                                tpc = 0; //-1
+                                tpc_accumulated--;
+                            }
+                            else if (normalized_rx_power<(target_rx_power-1)) {
+                                tpc = 2; //+1
+                                tpc_accumulated++;
+                            }
+                            else
+                                tpc = 1; //0
+                        }
+                        else
+                            tpc = 1; //0
+
+                        LOG_D(MAC,"[eNB %d] ULSCH scheduler: subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d\n",module_idP,subframeP,harq_pid,tpc,tpc_accumulated,normalized_rx_power,target_rx_power);
+
+
+                        // new transmission
+                        if (round==0) {
+
+                            ndi = 1-UE_template->oldNDI_UL[harq_pid];
+                            UE_template->oldNDI_UL[harq_pid]=ndi;
+                            //mcs = 10;
+                            UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=UE_template->pre_assigned_mcs_ul;
+                            mcs = cmin (UE_template->pre_assigned_mcs_ul, openair_daq_vars.target_ue_ul_mcs); // adjust, based on user-defined MCS
+                            if (UE_template->pre_allocated_rb_table_index_ul >=0)
+                                rb_table_index=UE_template->pre_allocated_rb_table_index_ul;
+                            else {
+                                mcs=10;rb_table_index=5; // for PHR
+                            }
+                            UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=mcs;
+                            buffer_occupancy = UE_template->ul_total_buffer;
+
+                            while ((rb_table[rb_table_index]>(frame_parms->N_RB_UL-1-first_rb[CC_id])) &&
+                                            (rb_table_index>0)) {
+                                rb_table_index--;
+                            }
+                            TBS = mac_xface->get_TBS_UL(mcs,rb_table[rb_table_index]);
+                            buffer_occupancy -= TBS;
+                            rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
+                                                            first_rb[CC_id],
+                                                            rb_table[rb_table_index]);
+                            // increment for next UE allocation
+                            first_rb[CC_id]+=rb_table[rb_table_index];
+                            //store for possible retransmission
+                            UE_template->nb_rb_ul[harq_pid] = rb_table[rb_table_index];
+
+                            LOG_D(MAC,"[eNB %d][PUSCH %d/%x] Frame %d subframeP %d Scheduled UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d)\n",
+                                  module_idP,harq_pid,rnti,frameP,subframeP,UE_id,mcs,
+                                  first_rb[CC_id],rb_table[rb_table_index],
+                                  rb_table_index,TBS,harq_pid);
+                            // Adjust BSR entries for LCGIDs
+                            adjust_bsr_info(buffer_occupancy,
+                                            TBS,
+                                            UE_template);
+
+                        }
+                        else if (round > 0) { //we schedule a retransmission
+
+                            ndi = UE_template->oldNDI_UL[harq_pid];
+                            if ((round&3)==0)
+                                mcs = openair_daq_vars.target_ue_ul_mcs;
+                            else
+                                mcs = rvidx_tab[round&3] + 28; //not correct for round==4!
+
+
+                            LOG_D(MAC,"[eNB %d][PUSCH %d/%x] Frame %d subframeP %d Scheduled UE retransmission (mcs %d, first rb %d, nb_rb %d, TBS %d, harq_pid %d, round %d)\n",
+                                  module_idP,UE_id,rnti,frameP,subframeP,mcs,
+                                  first_rb[CC_id],UE_template->nb_rb_ul[harq_pid],
+                                  TBS,//mac_xface->get_TBS_UL(mcs,UE_template->nb_rb_ul[harq_pid]),
+                                  harq_pid, round);
+
+                            rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
+                                                            first_rb[CC_id],
+                                                            UE_template->nb_rb_ul[harq_pid]);
+                            first_rb[CC_id]+=UE_template->nb_rb_ul[harq_pid];  // increment for next UE allocation
+                        }
+
+                        // Cyclic shift for DM RS
+                        if(cooperation_flag == 2) {
+                            if(UE_id == 1)// For Distriibuted Alamouti, cyclic shift applied to 2nd UE
+                                cshift = 1;
+                            else
+                                cshift = 0;
+                        }
+                        else
+                            cshift = 0;// values from 0 to 7 can be used for mapping the cyclic shift (36.211 , Table 5.5.2.1.1-1)
+
+                        if (frame_parms->frame_type == TDD) {
+                            switch (frame_parms->N_RB_UL) {
+                                case 6:
+                                    ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
+
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
+                                    ((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
+
+                                    add_ue_spec_dci(DCI_pdu,
+                                                    ULSCH_dci,
+                                                    rnti,
+                                                    sizeof(DCI0_1_5MHz_TDD_1_6_t),
+                                                    aggregation,
+                                                    sizeof_DCI0_1_5MHz_TDD_1_6_t,
+                                                    format0,
+                                                    0);
+                                    break;
+                                default:
+                                case 25:
+                                    ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
+
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
+                                    ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
+
+                                    add_ue_spec_dci(DCI_pdu,
+                                                    ULSCH_dci,
+                                                    rnti,
+                                                    sizeof(DCI0_5MHz_TDD_1_6_t),
+                                                    aggregation,
+                                                    sizeof_DCI0_5MHz_TDD_1_6_t,
+                                                    format0,
+                                                    0);
+                                    break;
+                                case 50:
+                                    ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
+
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
+
+                                    add_ue_spec_dci(DCI_pdu,
+                                                    ULSCH_dci,
+                                                    rnti,
+                                                    sizeof(DCI0_10MHz_TDD_1_6_t),
+                                                    aggregation,
+                                                    sizeof_DCI0_10MHz_TDD_1_6_t,
+                                                    format0,
+                                                    0);
+                                    break;
+                                case 100:
+                                    ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
+
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
+                                    ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
+                                    ((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
+
+                                    add_ue_spec_dci(DCI_pdu,
+                                                    ULSCH_dci,
+                                                    rnti,
+                                                    sizeof(DCI0_20MHz_TDD_1_6_t),
+                                                    aggregation,
+                                                    sizeof_DCI0_20MHz_TDD_1_6_t,
+                                                    format0,
+                                                    0);
+                                    break;
+                            }
+                        } // TDD
+                        else { //FDD
+                            switch (frame_parms->N_RB_UL) {
+                                case 25:
+                                default:
+
+                                    ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
+
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->type     = 0;
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->padding  = 0;
+                                    ((DCI0_5MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
+
+                                    add_ue_spec_dci(DCI_pdu,
+                                                    ULSCH_dci,
+                                                    rnti,
+                                                    sizeof(DCI0_5MHz_FDD_t),
+                                                    aggregation,
+                                                    sizeof_DCI0_5MHz_FDD_t,
+                                                    format0,
+                                                    0);
+                                    break;
+                                case 6:
+                                    ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
+
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->type     = 0;
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->padding  = 0;
+                                    ((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
+
+                                    add_ue_spec_dci(DCI_pdu,
+                                                    ULSCH_dci,
+                                                    rnti,
+                                                    sizeof(DCI0_1_5MHz_FDD_t),
+                                                    aggregation,
+                                                    sizeof_DCI0_1_5MHz_FDD_t,
+                                                    format0,
+                                                    0);
+                                    break;
+                                case 50:
+                                    ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
+
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->type     = 0;
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->padding  = 0;
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
+                                    ((DCI0_10MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
+
+                                    add_ue_spec_dci(DCI_pdu,
+                                                    ULSCH_dci,
+                                                    rnti,
+                                                    sizeof(DCI0_10MHz_FDD_t),
+                                                    aggregation,
+                                                    sizeof_DCI0_10MHz_FDD_t,
+                                                    format0,
+                                                    0);
+                                    break;
+                                case 100:
+                                    ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
+
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->type     = 0;
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->padding  = 0;
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
+                                    ((DCI0_20MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
+
+                                    add_ue_spec_dci(DCI_pdu,
+                                                    ULSCH_dci,
+                                                    rnti,
+                                                    sizeof(DCI0_20MHz_FDD_t),
+                                                    aggregation,
+                                                    sizeof_DCI0_20MHz_FDD_t,
+                                                    format0,
+                                                    0);
+                                    break;
+
+                            }
+                        }
+
+                        add_ue_ulsch_info(module_idP,
+                                          CC_id,
+                                          UE_id,
+                                          subframeP,
+                                          S_UL_SCHEDULED);
+
+                        nCCE[CC_id] = nCCE[CC_id] + (1<<aggregation);
+                        nCCE_available[CC_id] = mac_xface->get_nCCE_max(module_idP,CC_id) - nCCE[CC_id];
+
+                        LOG_D(MAC,"[eNB %d] Frame %d, subframeP %d: Generated ULSCH DCI for next UE_id %d, format 0\n", module_idP,frameP,subframeP,UE_id);
 #ifdef DEBUG
-	      dump_dci(frame_parms, &DCI_pdu->dci_alloc[DCI_pdu->Num_common_dci+DCI_pdu->Num_ue_spec_dci-1]);
+                        dump_dci(frame_parms, &DCI_pdu->dci_alloc[DCI_pdu->Num_common_dci+DCI_pdu->Num_ue_spec_dci-1]);
 #endif
-	      
-	    } // UE_is_to_be_scheduled
-      } // UE is in PUSCH
-    } // loop over UE_id
-  } // loop of CC_id
+
+                    } // UE_is_to_be_scheduled
+            } // UE is in PUSCH
+        } // loop over UE_id
+    } // loop of CC_id
 }
 
 #ifdef CBA
 void schedule_ulsch_cba_rnti(module_id_t module_idP, unsigned char cooperation_flag, frame_t frameP, sub_frame_t subframeP, unsigned char sched_subframe, unsigned int *nCCE, unsigned int *nCCE_available, uint16_t *first_rb){
 
-  eNB_MAC_INST *eNB = &eNB_mac_inst[module_idP];
-  UE_list_t         *UE_list=&eNB->UE_list;
-  //UE_TEMPLATE       *UE_template;
-  void              *ULSCH_dci      = NULL;
-  DCI_PDU *DCI_pdu;
-  uint8_t CC_id=0;
-  uint8_t rb_table_index=0, aggregation=2;
-  uint32_t rballoc;
-  uint8_t cba_group, cba_resources;
-  uint8_t required_rbs[NUM_MAX_CBA_GROUP];
-  int8_t num_cba_resources[NUM_MAX_CBA_GROUP];// , weight[NUM_MAX_CBA_GROUP]
-  // the following vars should become a vector [MAX_NUM_CCs]
-  LTE_DL_FRAME_PARMS   *frame_parms;
-  int8_t available_rbs=0;
-  uint8_t remaining_rbs=0;
-  uint8_t allocated_rbs=0;
-  uint8_t total_UEs=UE_list->num_UEs;
-  uint8_t active_UEs[NUM_MAX_CBA_GROUP];
-  uint8_t total_groups=eNB_mac_inst[module_idP].common_channels[CC_id].num_active_cba_groups;
-  int     min_rb_unit=2;
-  uint8_t cba_policy=CBA_ES;
-  int     UE_id;
-  uint8_t mcs[NUM_MAX_CBA_GROUP];
-  uint32_t total_cba_resources=0;
-  uint32_t total_rbs=0;
-  // We compute the weight of each group and initialize some variables
-
-  // loop over all active UEs
-  //  for (UE_id=UE_list->head_ul;UE_id>=0;UE_id=UE_list->next_ul[UE_id]) {
-
-  for (cba_group=0;cba_group<total_groups;cba_group++) {
-    // UEs in PUSCH with traffic
-    //    weight[cba_group] = 0;
-    required_rbs[cba_group] = 0;
-    num_cba_resources[cba_group]=0;
-    active_UEs[cba_group]=0;
-    mcs[cba_group]=openair_daq_vars.target_ue_ul_mcs;
-  }
-  //LOG_D(MAC, "[eNB ] CBA granted ues are %d\n",granted_UEs );
-
-  for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
-    
-    frame_parms=mac_xface->get_lte_frame_parms(module_idP,CC_id); 
-    available_rbs=frame_parms->N_RB_DL-1-first_rb[CC_id];
-    remaining_rbs=available_rbs;
-    total_groups=eNB_mac_inst[module_idP].common_channels[CC_id].num_active_cba_groups;
-    min_rb_unit=get_min_rb_unit(module_idP,CC_id);
-    
-    if (available_rbs  < min_rb_unit )
-      continue;
-    
-    // remove this condition later
-    // cba group template uses the exisitng UE template, and thus if a UE
-    // is scheduled, the correspodning group can't be used for CBA 
-    // this can be fixed later
-    if ((total_groups > 0) && (nCCE[CC_id] == 0)) {
-      DCI_pdu = &eNB_mac_inst[module_idP].common_channels[CC_id].DCI_pdu;
-
-      for (cba_group=0;
-	   (cba_group<total_groups)  && (nCCE_available[CC_id]* (total_cba_resources+1) > (1<<aggregation));
-	   cba_group++) {
-	// equal weight 
-	//weight[cba_group] = floor(total_UEs/active_groups);//find_num_active_UEs_in_cbagroup(module_idP, cba_group);
-     
-	for (UE_id=UE_list->head_ul;UE_id>=0;UE_id=UE_list->next_ul[UE_id]) {
-	  if (UE_RNTI(module_idP,UE_id)==0) 
-	    continue;
-	  // simple UE identity based grouping 
-	  if ((UE_id % total_groups) == cba_group){ // this could be simplifed to  active_UEs[UE_id % total_groups]++;
-	    if ((mac_get_rrc_status(module_idP,1,UE_id) > RRC_CONNECTED) && 
-		(UE_is_to_be_scheduled(module_idP,CC_id,UE_id) == 0))
-	      active_UEs[cba_group]++;
-	  }
-	  if (UE_list->UE_template[CC_id][UE_id].pre_assigned_mcs_ul <= 2)
-	    mcs[cba_group]= 8; // apply fixed scheduling 
-	  else if ((UE_id % total_groups) == cba_group) 
-	    mcs[cba_group]= cmin(mcs[cba_group],UE_list->UE_template[CC_id][UE_id].pre_assigned_mcs_ul);
-	}
-	mcs[cba_group]= cmin(mcs[cba_group],openair_daq_vars.target_ue_ul_mcs);
-	
-	if (available_rbs < min_rb_unit )
-	  break;
-	// If the group needs some resource
-	// determine the total number of allocations (one or multiple DCIs): to be refined
-	if ((active_UEs[cba_group] > 0) && (eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group] != 0)){
-	  // to be refined in case of : total_UEs >> weight[cba_group]*available_rbs
-	  
-	  switch(cba_policy) {
-	  case CBA_ES:
-	    required_rbs[cba_group] = (uint8_t)floor(available_rbs/total_groups); // allocate equally among groups
-	    num_cba_resources[cba_group]=1;
-	    break;
-	    // can't have more than one allocation for the same group/UE
-	    /*  case CBA_ES_S: 
+    eNB_MAC_INST *eNB = &eNB_mac_inst[module_idP];
+    UE_list_t         *UE_list=&eNB->UE_list;
+    //UE_TEMPLATE       *UE_template;
+    void              *ULSCH_dci      = NULL;
+    DCI_PDU *DCI_pdu;
+    uint8_t CC_id=0;
+    uint8_t rb_table_index=0, aggregation=2;
+    uint32_t rballoc;
+    uint8_t cba_group, cba_resources;
+    uint8_t required_rbs[NUM_MAX_CBA_GROUP];
+    int8_t num_cba_resources[NUM_MAX_CBA_GROUP];// , weight[NUM_MAX_CBA_GROUP]
+    // the following vars should become a vector [MAX_NUM_CCs]
+    LTE_DL_FRAME_PARMS   *frame_parms;
+    int8_t available_rbs=0;
+    uint8_t remaining_rbs=0;
+    uint8_t allocated_rbs=0;
+    uint8_t total_UEs=UE_list->num_UEs;
+    uint8_t active_UEs[NUM_MAX_CBA_GROUP];
+    uint8_t total_groups=eNB_mac_inst[module_idP].common_channels[CC_id].num_active_cba_groups;
+    int     min_rb_unit=2;
+    uint8_t cba_policy=CBA_ES;
+    int     UE_id;
+    uint8_t mcs[NUM_MAX_CBA_GROUP];
+    uint32_t total_cba_resources=0;
+    uint32_t total_rbs=0;
+    // We compute the weight of each group and initialize some variables
+
+    // loop over all active UEs
+    //  for (UE_id=UE_list->head_ul;UE_id>=0;UE_id=UE_list->next_ul[UE_id]) {
+
+    for (cba_group=0;cba_group<total_groups;cba_group++) {
+        // UEs in PUSCH with traffic
+        //    weight[cba_group] = 0;
+        required_rbs[cba_group] = 0;
+        num_cba_resources[cba_group]=0;
+        active_UEs[cba_group]=0;
+        mcs[cba_group]=openair_daq_vars.target_ue_ul_mcs;
+    }
+    //LOG_D(MAC, "[eNB ] CBA granted ues are %d\n",granted_UEs );
+
+    for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
+
+        frame_parms=mac_xface->get_lte_frame_parms(module_idP,CC_id);
+        available_rbs=frame_parms->N_RB_DL-1-first_rb[CC_id];
+        remaining_rbs=available_rbs;
+        total_groups=eNB_mac_inst[module_idP].common_channels[CC_id].num_active_cba_groups;
+        min_rb_unit=get_min_rb_unit(module_idP,CC_id);
+
+        if (available_rbs  < min_rb_unit )
+            continue;
+
+        // remove this condition later
+        // cba group template uses the exisitng UE template, and thus if a UE
+        // is scheduled, the correspodning group can't be used for CBA
+        // this can be fixed later
+        if ((total_groups > 0) && (nCCE[CC_id] == 0)) {
+            DCI_pdu = &eNB_mac_inst[module_idP].common_channels[CC_id].DCI_pdu;
+
+            for (cba_group=0;
+                            (cba_group<total_groups)  && (nCCE_available[CC_id]* (total_cba_resources+1) > (1<<aggregation));
+                            cba_group++) {
+                // equal weight
+                //weight[cba_group] = floor(total_UEs/active_groups);//find_num_active_UEs_in_cbagroup(module_idP, cba_group);
+
+                for (UE_id=UE_list->head_ul;UE_id>=0;UE_id=UE_list->next_ul[UE_id]) {
+                    if (UE_RNTI(module_idP,UE_id)==0)
+                        continue;
+                    // simple UE identity based grouping
+                    if ((UE_id % total_groups) == cba_group){ // this could be simplifed to  active_UEs[UE_id % total_groups]++;
+                        if ((mac_get_rrc_status(module_idP,1,UE_id) > RRC_CONNECTED) &&
+                                        (UE_is_to_be_scheduled(module_idP,CC_id,UE_id) == 0))
+                            active_UEs[cba_group]++;
+                    }
+                    if (UE_list->UE_template[CC_id][UE_id].pre_assigned_mcs_ul <= 2)
+                        mcs[cba_group]= 8; // apply fixed scheduling
+                    else if ((UE_id % total_groups) == cba_group)
+                        mcs[cba_group]= cmin(mcs[cba_group],UE_list->UE_template[CC_id][UE_id].pre_assigned_mcs_ul);
+                }
+                mcs[cba_group]= cmin(mcs[cba_group],openair_daq_vars.target_ue_ul_mcs);
+
+                if (available_rbs < min_rb_unit )
+                    break;
+                // If the group needs some resource
+                // determine the total number of allocations (one or multiple DCIs): to be refined
+                if ((active_UEs[cba_group] > 0) && (eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group] != 0)){
+                    // to be refined in case of : total_UEs >> weight[cba_group]*available_rbs
+
+                    switch(cba_policy) {
+                        case CBA_ES:
+                            required_rbs[cba_group] = (uint8_t)floor(available_rbs/total_groups); // allocate equally among groups
+                            num_cba_resources[cba_group]=1;
+                            break;
+                            // can't have more than one allocation for the same group/UE
+                            /*  case CBA_ES_S:
 	    required_rbs[cba_group] = (uint8_t)floor(available_rbs/total_groups); // allocate equally among groups
 	    if (required_rbs[cba_group] > min_rb_unit)
 	      num_cba_resources[cba_group]=(uint8_t)(required_rbs[cba_group]/ min_rb_unit);
 	      break;*/
-	  case CBA_PF:
-	    required_rbs[cba_group] = (uint8_t)floor((active_UEs[cba_group]*available_rbs)/total_UEs);
-	    num_cba_resources[cba_group]=1;
-	    break;
-	    /* case CBA_PF_S:
+                        case CBA_PF:
+                            required_rbs[cba_group] = (uint8_t)floor((active_UEs[cba_group]*available_rbs)/total_UEs);
+                            num_cba_resources[cba_group]=1;
+                            break;
+                            /* case CBA_PF_S:
 	    required_rbs[cba_group] = (uint8_t)ceil((active_UEs[cba_group]*available_rbs)/total_UEs);
 	    if (required_rbs[cba_group] > min_rb_unit)
 	      num_cba_resources[cba_group]=(uint8_t) floor(required_rbs[cba_group] / min_rb_unit);
 	    break;*/
-	    
-	  default:
-	    LOG_W(MAC,"unknown CBA policy\n");
-	    break;
-	  }
-	  total_cba_resources+=num_cba_resources[cba_group];
-	  total_rbs+=required_rbs[cba_group]; 
-	  
-	  /*  while ((remaining_rbs < required_rbs[cba_group]) && 
+
+                        default:
+                            LOG_W(MAC,"unknown CBA policy\n");
+                            break;
+                    }
+                    total_cba_resources+=num_cba_resources[cba_group];
+                    total_rbs+=required_rbs[cba_group];
+
+                    /*  while ((remaining_rbs < required_rbs[cba_group]) &&
 		 (required_rbs[cba_group] > 0) && 
 		 (required_rbs[cba_group] < min_rb_unit ))
 	    required_rbs[cba_group]--;
-	  */
-	  
-	  /*
+                     */
+
+                    /*
 	    while (rb_table[rb_table_index] < required_rbs[cba_group])
 	    rb_table_index++;
 
@@ -1089,177 +1089,177 @@ void schedule_ulsch_cba_rnti(module_id_t module_idP, unsigned char cooperation_f
 
 	    remaining_rbs-=rb_table[rb_table_index];
 	    required_rbs[cba_group]=rb_table[rb_table_index];
-	  */
-	  //	  num_cba_resources[cba_group]=1;
-
-	}
-      }
-      // phase 2 reduce the number of cba allocations among the groups
-      cba_group=0;
-      while  (nCCE[CC_id] + (1<<aggregation) * total_cba_resources >= nCCE_available[CC_id]){
-	num_cba_resources[cba_group%total_groups]--;
-	total_cba_resources--;
-	//	LOG_N(MAC,"reducing num cba resources to %d for group %d \n",	num_cba_resources[cba_group%total_groups], cba_group%total_groups );
-      	cba_group++;
-      }
-      
-      if (total_cba_resources <= 0)
-	return;
-      
-      // increase rb if any left: to be done 
-      cba_group=0;
-      while (total_rbs  < available_rbs - 1 ){
-	required_rbs[cba_group%total_groups]++;
-	total_rbs++;
-	cba_group++;
-      }
-
-      // phase 3: 
-      for (cba_group=0;cba_group<total_groups;cba_group++) {
-
-	LOG_N(MAC,"[eNB %d] Frame %d, subframe %d: cba group %d active_ues %d total groups %d mcs %d, available/required rb (%d/%d), num resources %d, ncce (%d/%d required %d \n",
-	      module_idP, frameP, subframeP, cba_group,active_UEs[cba_group],total_groups,
-	      mcs[cba_group], available_rbs,required_rbs[cba_group],
-	      num_cba_resources[cba_group],
-	      nCCE[CC_id],nCCE_available[CC_id],(1<<aggregation) * num_cba_resources[cba_group]);
-	
-	for (cba_resources=0; cba_resources < num_cba_resources[cba_group]; cba_resources++){
-	  rb_table_index =0;
-	  // check if there was an allocation for this group in the 1st phase
-	  if (required_rbs[cba_group] == 0 )
-	    continue;
-
-	  while (rb_table[rb_table_index] < (uint8_t) ceil(required_rbs[cba_group] / num_cba_resources[cba_group]) )
-	    rb_table_index++;
-
-	  while (rb_table[rb_table_index] > remaining_rbs )
-	    rb_table_index--;
-
-	  remaining_rbs-=rb_table[rb_table_index];
-	  allocated_rbs=rb_table[rb_table_index];
-
-	  rballoc = mac_xface->computeRIV(mac_xface->lte_frame_parms->N_RB_UL,
-					  first_rb[CC_id],
-					  rb_table[rb_table_index]);
-
-	  first_rb[CC_id]+=rb_table[rb_table_index];
-	  LOG_N(MAC,"[eNB %d] Frame %d, subframeP %d: schedule CBA access %d rnti %x, total/required/allocated/remaining rbs (%d/%d/%d/%d), mcs %d, rballoc %d, nCCE (%d/%d)\n",
-		module_idP, frameP, subframeP, cba_group,eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
-		available_rbs, required_rbs[cba_group], allocated_rbs, remaining_rbs,
-		mcs[cba_group],rballoc,nCCE_available[CC_id],nCCE[CC_id]);
-
-	  switch (frame_parms->N_RB_UL) {
-	  case 6:
-	    mac_xface->macphy_exit("[MAC][eNB] CBA RB=6 not supported \n");
-	    break;
-	  case 25:
-	    if (frame_parms->frame_type == TDD) {
-	      ULSCH_dci = UE_list->UE_template[CC_id][cba_group].ULSCH_DCI[0];
-	      
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs[cba_group];
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = 1;
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = 1;//tpc;
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cba_group;
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_list->UE_template[CC_id][cba_group].DAI_ul[sched_subframe];
-	      ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = 1;
-	      
-	      //add_ue_spec_dci
-	      add_common_dci(DCI_pdu,
-			     ULSCH_dci,
-			     eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
-			     sizeof(DCI0_5MHz_TDD_1_6_t),
-			     aggregation,
-			     sizeof_DCI0_5MHz_TDD_1_6_t,
-			     format0,
-			     0);
-	    }
-	    else {
-	      ULSCH_dci = UE_list->UE_template[CC_id][cba_group].ULSCH_DCI[0];
-
-	      ((DCI0_5MHz_FDD_t *)ULSCH_dci)->type     = 0;
-	      ((DCI0_5MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-	      ((DCI0_5MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-	      ((DCI0_5MHz_FDD_t *)ULSCH_dci)->mcs      = mcs[cba_group];
-	      ((DCI0_5MHz_FDD_t *)ULSCH_dci)->ndi      = 1;
-	      ((DCI0_5MHz_FDD_t *)ULSCH_dci)->TPC      = 1;//tpc;
-	      ((DCI0_5MHz_FDD_t *)ULSCH_dci)->cshift   = cba_group;
-	      ((DCI0_5MHz_FDD_t *)ULSCH_dci)->cqi_req  = 1;
-	      
-	    //add_ue_spec_dci
-	    add_common_dci(DCI_pdu,
-			   ULSCH_dci,
-			   eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
-			   sizeof(DCI0_5MHz_FDD_t),
-			   aggregation,
-			   sizeof_DCI0_5MHz_FDD_t,
-			   format0,
-			   0);
-	    }
-	    LOG_D(MAC,"[eNB %d] Frame %d, subframeP %d: Generated ULSCH DCI for CBA group %d, RB 25 format 0\n", module_idP,frameP,subframeP,cba_group);
-	    break;
-	  case 50:
-	    if (frame_parms->frame_type == TDD) {
-	      ULSCH_dci = UE_list->UE_template[CC_id][cba_group].ULSCH_DCI[0];
-	      
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs[cba_group];
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = 1;
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = 1;//tpc;
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cba_group;
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_list->UE_template[CC_id][cba_group].DAI_ul[sched_subframe];
-	      ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = 1;
-	      
-	      //add_ue_spec_dci
-	      add_common_dci(DCI_pdu,
-			     ULSCH_dci,
-			     eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
-			     sizeof(DCI0_10MHz_TDD_1_6_t),
-			     aggregation,
-			     sizeof_DCI0_10MHz_TDD_1_6_t,
-			     format0,
-			     0);
-	    }
-	    else {
-	      ULSCH_dci = UE_list->UE_template[CC_id][cba_group].ULSCH_DCI[0];
-	      
-	      ((DCI0_10MHz_FDD_t *)ULSCH_dci)->type     = 0;
-	      ((DCI0_10MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-	      ((DCI0_10MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-	      ((DCI0_10MHz_FDD_t *)ULSCH_dci)->mcs      = mcs[cba_group];
-	      ((DCI0_10MHz_FDD_t *)ULSCH_dci)->ndi      = 1;
-	      ((DCI0_10MHz_FDD_t *)ULSCH_dci)->TPC      = 1;//tpc;
-	      ((DCI0_10MHz_FDD_t *)ULSCH_dci)->cshift   = cba_group;
-	      ((DCI0_10MHz_FDD_t *)ULSCH_dci)->cqi_req  = 1;
-	      
-	    //add_ue_spec_dci
-	    add_common_dci(DCI_pdu,
-			   ULSCH_dci,
-			   eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
-			   sizeof(DCI0_10MHz_FDD_t),
-			   aggregation,
-			   sizeof_DCI0_10MHz_FDD_t,
-			   format0,
-			   0);
-	    }
-	    LOG_D(MAC,"[eNB %d] Frame %d, subframeP %d: Generated ULSCH DCI for CBA group %d, RB 50 format 0\n", module_idP,frameP,subframeP,cba_group);
-	    break;
-	  case 100:
-	    mac_xface->macphy_exit("[MAC][eNB] CBA RB=100 not supported \n");
-	    break;
-	  default:
-	    break;
-	  }
-	  nCCE[CC_id] = nCCE[CC_id] + (1<<aggregation) ;
-	  nCCE_available[CC_id] = mac_xface->get_nCCE_max(module_idP,CC_id) - nCCE[CC_id];
-	  //      break;// for the moment only schedule one
-	}
-      }
+                     */
+                    //	  num_cba_resources[cba_group]=1;
+
+                }
+            }
+            // phase 2 reduce the number of cba allocations among the groups
+            cba_group=0;
+            while  (nCCE[CC_id] + (1<<aggregation) * total_cba_resources >= nCCE_available[CC_id]){
+                num_cba_resources[cba_group%total_groups]--;
+                total_cba_resources--;
+                //	LOG_N(MAC,"reducing num cba resources to %d for group %d \n",	num_cba_resources[cba_group%total_groups], cba_group%total_groups );
+                cba_group++;
+            }
+
+            if (total_cba_resources <= 0)
+                return;
+
+            // increase rb if any left: to be done
+            cba_group=0;
+            while (total_rbs  < available_rbs - 1 ){
+                required_rbs[cba_group%total_groups]++;
+                total_rbs++;
+                cba_group++;
+            }
+
+            // phase 3:
+            for (cba_group=0;cba_group<total_groups;cba_group++) {
+
+                LOG_N(MAC,"[eNB %d] Frame %d, subframe %d: cba group %d active_ues %d total groups %d mcs %d, available/required rb (%d/%d), num resources %d, ncce (%d/%d required %d \n",
+                      module_idP, frameP, subframeP, cba_group,active_UEs[cba_group],total_groups,
+                      mcs[cba_group], available_rbs,required_rbs[cba_group],
+                      num_cba_resources[cba_group],
+                      nCCE[CC_id],nCCE_available[CC_id],(1<<aggregation) * num_cba_resources[cba_group]);
+
+                for (cba_resources=0; cba_resources < num_cba_resources[cba_group]; cba_resources++){
+                    rb_table_index =0;
+                    // check if there was an allocation for this group in the 1st phase
+                    if (required_rbs[cba_group] == 0 )
+                        continue;
+
+                    while (rb_table[rb_table_index] < (uint8_t) ceil(required_rbs[cba_group] / num_cba_resources[cba_group]) )
+                        rb_table_index++;
+
+                    while (rb_table[rb_table_index] > remaining_rbs )
+                        rb_table_index--;
+
+                    remaining_rbs-=rb_table[rb_table_index];
+                    allocated_rbs=rb_table[rb_table_index];
+
+                    rballoc = mac_xface->computeRIV(mac_xface->lte_frame_parms->N_RB_UL,
+                                                    first_rb[CC_id],
+                                                    rb_table[rb_table_index]);
+
+                    first_rb[CC_id]+=rb_table[rb_table_index];
+                    LOG_N(MAC,"[eNB %d] Frame %d, subframeP %d: schedule CBA access %d rnti %x, total/required/allocated/remaining rbs (%d/%d/%d/%d), mcs %d, rballoc %d, nCCE (%d/%d)\n",
+                          module_idP, frameP, subframeP, cba_group,eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
+                          available_rbs, required_rbs[cba_group], allocated_rbs, remaining_rbs,
+                          mcs[cba_group],rballoc,nCCE_available[CC_id],nCCE[CC_id]);
+
+                    switch (frame_parms->N_RB_UL) {
+                        case 6:
+                            mac_xface->macphy_exit("[MAC][eNB] CBA RB=6 not supported \n");
+                            break;
+                        case 25:
+                            if (frame_parms->frame_type == TDD) {
+                                ULSCH_dci = UE_list->UE_template[CC_id][cba_group].ULSCH_DCI[0];
+
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs[cba_group];
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = 1;
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = 1;//tpc;
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cba_group;
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_list->UE_template[CC_id][cba_group].DAI_ul[sched_subframe];
+                                ((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = 1;
+
+                                //add_ue_spec_dci
+                                add_common_dci(DCI_pdu,
+                                               ULSCH_dci,
+                                               eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
+                                               sizeof(DCI0_5MHz_TDD_1_6_t),
+                                               aggregation,
+                                               sizeof_DCI0_5MHz_TDD_1_6_t,
+                                               format0,
+                                               0);
+                            }
+                            else {
+                                ULSCH_dci = UE_list->UE_template[CC_id][cba_group].ULSCH_DCI[0];
+
+                                ((DCI0_5MHz_FDD_t *)ULSCH_dci)->type     = 0;
+                                ((DCI0_5MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
+                                ((DCI0_5MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
+                                ((DCI0_5MHz_FDD_t *)ULSCH_dci)->mcs      = mcs[cba_group];
+                                ((DCI0_5MHz_FDD_t *)ULSCH_dci)->ndi      = 1;
+                                ((DCI0_5MHz_FDD_t *)ULSCH_dci)->TPC      = 1;//tpc;
+                                ((DCI0_5MHz_FDD_t *)ULSCH_dci)->cshift   = cba_group;
+                                ((DCI0_5MHz_FDD_t *)ULSCH_dci)->cqi_req  = 1;
+
+                                //add_ue_spec_dci
+                                add_common_dci(DCI_pdu,
+                                               ULSCH_dci,
+                                               eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
+                                               sizeof(DCI0_5MHz_FDD_t),
+                                               aggregation,
+                                               sizeof_DCI0_5MHz_FDD_t,
+                                               format0,
+                                               0);
+                            }
+                            LOG_D(MAC,"[eNB %d] Frame %d, subframeP %d: Generated ULSCH DCI for CBA group %d, RB 25 format 0\n", module_idP,frameP,subframeP,cba_group);
+                            break;
+                        case 50:
+                            if (frame_parms->frame_type == TDD) {
+                                ULSCH_dci = UE_list->UE_template[CC_id][cba_group].ULSCH_DCI[0];
+
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs[cba_group];
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = 1;
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = 1;//tpc;
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cba_group;
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_list->UE_template[CC_id][cba_group].DAI_ul[sched_subframe];
+                                ((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = 1;
+
+                                //add_ue_spec_dci
+                                add_common_dci(DCI_pdu,
+                                               ULSCH_dci,
+                                               eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
+                                               sizeof(DCI0_10MHz_TDD_1_6_t),
+                                               aggregation,
+                                               sizeof_DCI0_10MHz_TDD_1_6_t,
+                                               format0,
+                                               0);
+                            }
+                            else {
+                                ULSCH_dci = UE_list->UE_template[CC_id][cba_group].ULSCH_DCI[0];
+
+                                ((DCI0_10MHz_FDD_t *)ULSCH_dci)->type     = 0;
+                                ((DCI0_10MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
+                                ((DCI0_10MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
+                                ((DCI0_10MHz_FDD_t *)ULSCH_dci)->mcs      = mcs[cba_group];
+                                ((DCI0_10MHz_FDD_t *)ULSCH_dci)->ndi      = 1;
+                                ((DCI0_10MHz_FDD_t *)ULSCH_dci)->TPC      = 1;//tpc;
+                                ((DCI0_10MHz_FDD_t *)ULSCH_dci)->cshift   = cba_group;
+                                ((DCI0_10MHz_FDD_t *)ULSCH_dci)->cqi_req  = 1;
+
+                                //add_ue_spec_dci
+                                add_common_dci(DCI_pdu,
+                                               ULSCH_dci,
+                                               eNB_mac_inst[module_idP].common_channels[CC_id].cba_rnti[cba_group],
+                                               sizeof(DCI0_10MHz_FDD_t),
+                                               aggregation,
+                                               sizeof_DCI0_10MHz_FDD_t,
+                                               format0,
+                                               0);
+                            }
+                            LOG_D(MAC,"[eNB %d] Frame %d, subframeP %d: Generated ULSCH DCI for CBA group %d, RB 50 format 0\n", module_idP,frameP,subframeP,cba_group);
+                            break;
+                        case 100:
+                            mac_xface->macphy_exit("[MAC][eNB] CBA RB=100 not supported \n");
+                            break;
+                        default:
+                            break;
+                    }
+                    nCCE[CC_id] = nCCE[CC_id] + (1<<aggregation) ;
+                    nCCE_available[CC_id] = mac_xface->get_nCCE_max(module_idP,CC_id) - nCCE[CC_id];
+                    //      break;// for the moment only schedule one
+                }
+            }
+        }
     }
-  }
 }
 #endif