diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c
index 1def93e8c2..81a8478e33 100644
--- a/openair1/PHY/INIT/lte_init.c
+++ b/openair1/PHY/INIT/lte_init.c
@@ -145,6 +145,61 @@ void phy_config_request(PHY_Config_t *phy_config) {
   LOG_I(PHY,"prach_config_common.prach_ConfigInfo.prach_FreqOffset = %d\n",cfg->prach_config.frequency_offset.value);
 
   init_prach_tables(839);
+#ifdef Rel14
+  fp->prach_emtc_config_common.prach_Config_enabled=1;
+
+  fp->prach_emtc_config_common.rootSequenceIndex                                         = cfg->emtc_config.prach_catm_root_sequence_index.value;
+
+  fp->prach_emtc_config_common.prach_ConfigInfo.highSpeedFlag                            = cfg->emtc_config.prach_catm_high_speed_flag.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig                = cfg->emtc_config.prach_catm_zero_correlation_zone_configuration.value;
+
+  // CE Level 3 parameters
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[3]                  = cfg->emtc_config.prach_ce_level_3_enable.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_starting_subframe_periodicity[3]   = cfg->emtc_config.prach_ce_level_3_starting_subframe_periodicity.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[3] = cfg->emtc_config.prach_ce_level_3_number_of_repetitions_per_attempt.value;
+  AssertFatal(fp->prach_emtc_config_common.prach_ConfigInfo.prach_starting_subframe_periodicity[3]>=fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[3],
+	      "prach_starting_subframe_periodicity[3] < prach_numPetitionPerPreambleAttempt[3]\n");
+
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[3]                     = cfg->emtc_config.prach_ce_level_3_configuration_index.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[3]                      = cfg->emtc_config.prach_ce_level_3_frequency_offset.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_hopping_enable[3]                  = cfg->emtc_config.prach_ce_level_3_hopping_enable.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_hopping_offset[3]                  = cfg->emtc_config.prach_ce_level_3_hopping_offset.value;
+
+  // CE Level 2 parameters
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[2]                  = cfg->emtc_config.prach_ce_level_2_enable.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_starting_subframe_periodicity[2]   = cfg->emtc_config.prach_ce_level_2_starting_subframe_periodicity.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[2] = cfg->emtc_config.prach_ce_level_2_number_of_repetitions_per_attempt.value;
+  AssertFatal(fp->prach_emtc_config_common.prach_ConfigInfo.prach_starting_subframe_periodicity[2]>=fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[2],
+	      "prach_starting_subframe_periodicity[2] < prach_numPetitionPerPreambleAttempt[2]\n");
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[2]                     = cfg->emtc_config.prach_ce_level_2_configuration_index.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[2]                      = cfg->emtc_config.prach_ce_level_2_frequency_offset.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_hopping_enable[2]                  = cfg->emtc_config.prach_ce_level_2_hopping_enable.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_hopping_offset[2]                  = cfg->emtc_config.prach_ce_level_2_hopping_offset.value;
+
+  // CE Level 1 parameters
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[1]                  = cfg->emtc_config.prach_ce_level_1_enable.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_starting_subframe_periodicity[1]   = cfg->emtc_config.prach_ce_level_1_starting_subframe_periodicity.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[1] = cfg->emtc_config.prach_ce_level_1_number_of_repetitions_per_attempt.value;
+  AssertFatal(fp->prach_emtc_config_common.prach_ConfigInfo.prach_starting_subframe_periodicity[1]>=fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[1],
+	      "prach_starting_subframe_periodicity[1] < prach_numPetitionPerPreambleAttempt[1]\n");
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[1]                     = cfg->emtc_config.prach_ce_level_1_configuration_index.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[1]                      = cfg->emtc_config.prach_ce_level_1_frequency_offset.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_hopping_enable[1]                  = cfg->emtc_config.prach_ce_level_1_hopping_enable.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_hopping_offset[1]                  = cfg->emtc_config.prach_ce_level_1_hopping_offset.value;
+
+  // CE Level 0 parameters
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[0]                  = cfg->emtc_config.prach_ce_level_0_enable.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_starting_subframe_periodicity[0]   = cfg->emtc_config.prach_ce_level_0_starting_subframe_periodicity.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[0] = cfg->emtc_config.prach_ce_level_0_number_of_repetitions_per_attempt.value;
+  AssertFatal(fp->prach_emtc_config_common.prach_ConfigInfo.prach_starting_subframe_periodicity[0]>=fp->prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[0],
+	      "prach_starting_subframe_periodicity[0] < prach_numPetitionPerPreambleAttempt[0]\n");
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[0]                     = cfg->emtc_config.prach_ce_level_0_configuration_index.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[0]                      = cfg->emtc_config.prach_ce_level_0_frequency_offset.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_hopping_enable[0]                = cfg->emtc_config.prach_ce_level_0_hopping_enable.value;
+  fp->prach_emtc_config_common.prach_ConfigInfo.prach_hopping_offset[0]                = cfg->emtc_config.prach_ce_level_0_hopping_offset.value;
+
+#endif
+
   compute_prach_seq(&fp->prach_config_common,fp->frame_type,
                     RC.eNB[Mod_id][CC_id]->X_u);
 
@@ -1278,31 +1333,30 @@ int init_lte_ue_signal(PHY_VARS_UE *ue,
   for (i=0;i<10;i++)
     ue->tx_power_dBm[i]=-127;
 
-  if (abstraction_flag == 0) {
 
-    // init TX buffers
-
-    common_vars->txdata  = (int32_t**)malloc16( fp->nb_antennas_tx*sizeof(int32_t*) );
-    common_vars->txdataF = (int32_t **)malloc16( fp->nb_antennas_tx*sizeof(int32_t*) );
-
-    for (i=0; i<fp->nb_antennas_tx; i++) {
-
-      common_vars->txdata[i]  = (int32_t*)malloc16_clear( fp->samples_per_tti*10*sizeof(int32_t) );
-      common_vars->txdataF[i] = (int32_t *)malloc16_clear( fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t) );
-    }
-
-    // init RX buffers
-
-    common_vars->rxdata   = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
-    common_vars->common_vars_rx_data_per_thread[0].rxdataF  = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
-    common_vars->common_vars_rx_data_per_thread[1].rxdataF  = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
-
-    for (i=0; i<fp->nb_antennas_rx; i++) {
-      common_vars->rxdata[i] = (int32_t*) malloc16_clear( (fp->samples_per_tti*10+2048)*sizeof(int32_t) );
-      common_vars->common_vars_rx_data_per_thread[0].rxdataF[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->ofdm_symbol_size*14) );
-      common_vars->common_vars_rx_data_per_thread[1].rxdataF[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->ofdm_symbol_size*14) );
-    }
+  // init TX buffers
+  
+  common_vars->txdata  = (int32_t**)malloc16( fp->nb_antennas_tx*sizeof(int32_t*) );
+  common_vars->txdataF = (int32_t **)malloc16( fp->nb_antennas_tx*sizeof(int32_t*) );
+  
+  for (i=0; i<fp->nb_antennas_tx; i++) {
+    
+    common_vars->txdata[i]  = (int32_t*)malloc16_clear( fp->samples_per_tti*10*sizeof(int32_t) );
+    common_vars->txdataF[i] = (int32_t *)malloc16_clear( fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t) );
   }
+  
+  // init RX buffers
+  
+  common_vars->rxdata   = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+  common_vars->common_vars_rx_data_per_thread[0].rxdataF  = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+  common_vars->common_vars_rx_data_per_thread[1].rxdataF  = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+  
+  for (i=0; i<fp->nb_antennas_rx; i++) {
+    common_vars->rxdata[i] = (int32_t*) malloc16_clear( (fp->samples_per_tti*10+2048)*sizeof(int32_t) );
+    common_vars->common_vars_rx_data_per_thread[0].rxdataF[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->ofdm_symbol_size*14) );
+    common_vars->common_vars_rx_data_per_thread[1].rxdataF[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->ofdm_symbol_size*14) );
+  }
+
 
   // Channel estimates
   for (eNB_id=0; eNB_id<7; eNB_id++) {
@@ -1333,140 +1387,140 @@ int init_lte_ue_signal(PHY_VARS_UE *ue,
     prach_vars[eNB_id]     = (LTE_UE_PRACH *)malloc16_clear(sizeof(LTE_UE_PRACH));
     pbch_vars[eNB_id]      = (LTE_UE_PBCH *)malloc16_clear(sizeof(LTE_UE_PBCH));
 
-    if (abstraction_flag == 0) {
-      phy_init_lte_ue__PDSCH( pdsch_vars_th0[eNB_id], fp );
-      phy_init_lte_ue__PDSCH( pdsch_vars_th1[eNB_id], fp );
 
-      // thread 0
-      pdsch_vars_th0[eNB_id]->llr_shifts      = (uint8_t*)malloc16_clear(7*2*fp->N_RB_DL*12);
-      pdsch_vars_th0[eNB_id]->llr_shifts_p        = pdsch_vars_th0[eNB_id]->llr_shifts;
-      pdsch_vars_th0[eNB_id]->llr[1]              = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
-      pdsch_vars_th0[eNB_id]->llr128_2ndstream    = (int16_t**)malloc16_clear( sizeof(int16_t*) );
-      pdsch_vars_th0[eNB_id]->rho                 = (int32_t**)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t*) );
-
-       // thread 0
-      pdsch_vars_th1[eNB_id]->llr_shifts      = (uint8_t*)malloc16_clear(7*2*fp->N_RB_DL*12);
-      pdsch_vars_th1[eNB_id]->llr_shifts_p        = pdsch_vars_th0[eNB_id]->llr_shifts;
-      pdsch_vars_th1[eNB_id]->llr[1]              = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
-      pdsch_vars_th1[eNB_id]->llr128_2ndstream    = (int16_t**)malloc16_clear( sizeof(int16_t*) );
-      pdsch_vars_th1[eNB_id]->rho                 = (int32_t**)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t*) );
-
-
-
-
-      for (int i=0; i<fp->nb_antennas_rx; i++){
-        pdsch_vars_th0[eNB_id]->rho[i]     = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-        pdsch_vars_th1[eNB_id]->rho[i]     = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-        }
-
-      pdsch_vars_th0[eNB_id]->dl_ch_rho2_ext      = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pdsch_vars_th1[eNB_id]->dl_ch_rho2_ext      = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-
-      for (i=0; i<fp->nb_antennas_rx; i++)
-        for (j=0; j<4; j++) {
-          const int idx = (j<<1)+i;
-          const size_t num = 7*2*fp->N_RB_DL*12+4;
-          pdsch_vars_th0[eNB_id]->dl_ch_rho2_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-          pdsch_vars_th1[eNB_id]->dl_ch_rho2_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-        }
-
-
-      //const size_t num = 7*2*fp->N_RB_DL*12+4;
-      for (k=0;k<8;k++) { //harq_pid
-        for (l=0;l<8;l++) { //round
-          pdsch_vars_th0[eNB_id]->rxdataF_comp1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-          pdsch_vars_th0[eNB_id]->dl_ch_rho_ext[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-          pdsch_vars_th0[eNB_id]->dl_ch_mag1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-          pdsch_vars_th0[eNB_id]->dl_ch_magb1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-
-          pdsch_vars_th1[eNB_id]->rxdataF_comp1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-          pdsch_vars_th1[eNB_id]->dl_ch_rho_ext[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-          pdsch_vars_th1[eNB_id]->dl_ch_mag1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-          pdsch_vars_th1[eNB_id]->dl_ch_magb1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-
-
-          for (int i=0; i<fp->nb_antennas_rx; i++)
-            for (int j=0; j<4; j++) { //frame_parms->nb_antennas_tx; j++)
-              const int idx = (j<<1)+i;
-              pdsch_vars_th0[eNB_id]->dl_ch_rho_ext[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-              pdsch_vars_th0[eNB_id]->rxdataF_comp1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-              pdsch_vars_th0[eNB_id]->dl_ch_mag1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-              pdsch_vars_th0[eNB_id]->dl_ch_magb1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-
-              pdsch_vars_th1[eNB_id]->dl_ch_rho_ext[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-              pdsch_vars_th1[eNB_id]->rxdataF_comp1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-              pdsch_vars_th1[eNB_id]->dl_ch_mag1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-              pdsch_vars_th1[eNB_id]->dl_ch_magb1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
-                }
-        }
+    phy_init_lte_ue__PDSCH( pdsch_vars_th0[eNB_id], fp );
+    phy_init_lte_ue__PDSCH( pdsch_vars_th1[eNB_id], fp );
+    
+    // thread 0
+    pdsch_vars_th0[eNB_id]->llr_shifts      = (uint8_t*)malloc16_clear(7*2*fp->N_RB_DL*12);
+    pdsch_vars_th0[eNB_id]->llr_shifts_p        = pdsch_vars_th0[eNB_id]->llr_shifts;
+    pdsch_vars_th0[eNB_id]->llr[1]              = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
+    pdsch_vars_th0[eNB_id]->llr128_2ndstream    = (int16_t**)malloc16_clear( sizeof(int16_t*) );
+    pdsch_vars_th0[eNB_id]->rho                 = (int32_t**)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t*) );
+    
+    // thread 0
+    pdsch_vars_th1[eNB_id]->llr_shifts      = (uint8_t*)malloc16_clear(7*2*fp->N_RB_DL*12);
+    pdsch_vars_th1[eNB_id]->llr_shifts_p        = pdsch_vars_th0[eNB_id]->llr_shifts;
+    pdsch_vars_th1[eNB_id]->llr[1]              = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
+    pdsch_vars_th1[eNB_id]->llr128_2ndstream    = (int16_t**)malloc16_clear( sizeof(int16_t*) );
+    pdsch_vars_th1[eNB_id]->rho                 = (int32_t**)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t*) );
+    
+    
+    
+    
+    for (int i=0; i<fp->nb_antennas_rx; i++){
+      pdsch_vars_th0[eNB_id]->rho[i]     = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+      pdsch_vars_th1[eNB_id]->rho[i]     = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+    }
+    
+    pdsch_vars_th0[eNB_id]->dl_ch_rho2_ext      = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pdsch_vars_th1[eNB_id]->dl_ch_rho2_ext      = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    
+    for (i=0; i<fp->nb_antennas_rx; i++)
+      for (j=0; j<4; j++) {
+	const int idx = (j<<1)+i;
+	const size_t num = 7*2*fp->N_RB_DL*12+4;
+	pdsch_vars_th0[eNB_id]->dl_ch_rho2_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+	pdsch_vars_th1[eNB_id]->dl_ch_rho2_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
       }
-      phy_init_lte_ue__PDSCH( pdsch_vars_SI[eNB_id], fp );
-      phy_init_lte_ue__PDSCH( pdsch_vars_ra[eNB_id], fp );
-      phy_init_lte_ue__PDSCH( pdsch_vars_mch[eNB_id], fp );
-
-      // 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
-      pdcch_vars_th0[eNB_id]->llr   = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
-      pdcch_vars_th0[eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
-      pdcch_vars_th0[eNB_id]->wbar  = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
-      pdcch_vars_th0[eNB_id]->e_rx  = (int8_t*)malloc16_clear( 4*2*100*12 );
-
-      pdcch_vars_th0[eNB_id]->rxdataF_comp        = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pdcch_vars_th0[eNB_id]->dl_ch_rho_ext       = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pdcch_vars_th0[eNB_id]->rho                 = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
-      pdcch_vars_th0[eNB_id]->rxdataF_ext         = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pdcch_vars_th0[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-
-      pdcch_vars_th1[eNB_id]->llr   = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
-      pdcch_vars_th1[eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
-      pdcch_vars_th1[eNB_id]->wbar  = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
-      pdcch_vars_th1[eNB_id]->e_rx  = (int8_t*)malloc16_clear( 4*2*100*12 );
-
-      pdcch_vars_th1[eNB_id]->rxdataF_comp        = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pdcch_vars_th1[eNB_id]->dl_ch_rho_ext       = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pdcch_vars_th1[eNB_id]->rho                 = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
-      pdcch_vars_th1[eNB_id]->rxdataF_ext         = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pdcch_vars_th1[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-
-      for (i=0; i<fp->nb_antennas_rx; i++) {
-        //ue_pdcch_vars[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
-        pdcch_vars_th0[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
-        pdcch_vars_th1[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
-
-        for (j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
-          int idx = (j<<1)+i;
-          //  size_t num = 7*2*fp->N_RB_DL*12;
-          size_t num = 4*100*12;  // 4 symbols, 100 PRBs, 12 REs per PRB
-          pdcch_vars_th0[eNB_id]->rxdataF_comp[idx]        = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-          pdcch_vars_th0[eNB_id]->dl_ch_rho_ext[idx]       = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-          pdcch_vars_th0[eNB_id]->rxdataF_ext[idx]         = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-          pdcch_vars_th0[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-
-          pdcch_vars_th1[eNB_id]->rxdataF_comp[idx]        = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-          pdcch_vars_th1[eNB_id]->dl_ch_rho_ext[idx]       = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-          pdcch_vars_th1[eNB_id]->rxdataF_ext[idx]         = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-          pdcch_vars_th1[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
-        }
-      }
-
-      // PBCH
-      pbch_vars[eNB_id]->rxdataF_ext         = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
-      pbch_vars[eNB_id]->rxdataF_comp        = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pbch_vars[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pbch_vars[eNB_id]->llr                 = (int8_t*)malloc16_clear( 1920 );
-      prach_vars[eNB_id]->prachF             = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
-      prach_vars[eNB_id]->prach              = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
-
-      for (i=0; i<fp->nb_antennas_rx; i++) {
-        pbch_vars[eNB_id]->rxdataF_ext[i]    = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
-
-        for (j=0; j<4; j++) {//fp->nb_antennas_tx;j++) {
-          int idx = (j<<1)+i;
-          pbch_vars[eNB_id]->rxdataF_comp[idx]        = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
-          pbch_vars[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
-        }
+    
+    
+    //const size_t num = 7*2*fp->N_RB_DL*12+4;
+    for (k=0;k<8;k++) { //harq_pid
+      for (l=0;l<8;l++) { //round
+	pdsch_vars_th0[eNB_id]->rxdataF_comp1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+	pdsch_vars_th0[eNB_id]->dl_ch_rho_ext[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+	pdsch_vars_th0[eNB_id]->dl_ch_mag1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+	pdsch_vars_th0[eNB_id]->dl_ch_magb1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+	
+	pdsch_vars_th1[eNB_id]->rxdataF_comp1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+	pdsch_vars_th1[eNB_id]->dl_ch_rho_ext[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+	pdsch_vars_th1[eNB_id]->dl_ch_mag1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+	pdsch_vars_th1[eNB_id]->dl_ch_magb1[k][l] = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+	
+	
+	for (int i=0; i<fp->nb_antennas_rx; i++)
+	  for (int j=0; j<4; j++) { //frame_parms->nb_antennas_tx; j++)
+	    const int idx = (j<<1)+i;
+	    pdsch_vars_th0[eNB_id]->dl_ch_rho_ext[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+	    pdsch_vars_th0[eNB_id]->rxdataF_comp1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+	    pdsch_vars_th0[eNB_id]->dl_ch_mag1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+	    pdsch_vars_th0[eNB_id]->dl_ch_magb1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+	    
+	    pdsch_vars_th1[eNB_id]->dl_ch_rho_ext[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+	    pdsch_vars_th1[eNB_id]->rxdataF_comp1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+	    pdsch_vars_th1[eNB_id]->dl_ch_mag1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+	    pdsch_vars_th1[eNB_id]->dl_ch_magb1[k][l][idx] = (int32_t*)malloc16_clear( 7*2*sizeof(int32_t)*(fp->N_RB_DL*12) );
+	  }
       }
     }
-
+    phy_init_lte_ue__PDSCH( pdsch_vars_SI[eNB_id], fp );
+    phy_init_lte_ue__PDSCH( pdsch_vars_ra[eNB_id], fp );
+    phy_init_lte_ue__PDSCH( pdsch_vars_mch[eNB_id], fp );
+    
+    // 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
+    pdcch_vars_th0[eNB_id]->llr   = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+    pdcch_vars_th0[eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+    pdcch_vars_th0[eNB_id]->wbar  = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+    pdcch_vars_th0[eNB_id]->e_rx  = (int8_t*)malloc16_clear( 4*2*100*12 );
+    
+    pdcch_vars_th0[eNB_id]->rxdataF_comp        = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pdcch_vars_th0[eNB_id]->dl_ch_rho_ext       = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pdcch_vars_th0[eNB_id]->rho                 = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+    pdcch_vars_th0[eNB_id]->rxdataF_ext         = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pdcch_vars_th0[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    
+    pdcch_vars_th1[eNB_id]->llr   = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+    pdcch_vars_th1[eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+    pdcch_vars_th1[eNB_id]->wbar  = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+    pdcch_vars_th1[eNB_id]->e_rx  = (int8_t*)malloc16_clear( 4*2*100*12 );
+    
+    pdcch_vars_th1[eNB_id]->rxdataF_comp        = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pdcch_vars_th1[eNB_id]->dl_ch_rho_ext       = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pdcch_vars_th1[eNB_id]->rho                 = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+    pdcch_vars_th1[eNB_id]->rxdataF_ext         = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pdcch_vars_th1[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    
+    for (i=0; i<fp->nb_antennas_rx; i++) {
+      //ue_pdcch_vars[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
+      pdcch_vars_th0[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
+      pdcch_vars_th1[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
+      
+      for (j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
+	int idx = (j<<1)+i;
+	//  size_t num = 7*2*fp->N_RB_DL*12;
+	size_t num = 4*100*12;  // 4 symbols, 100 PRBs, 12 REs per PRB
+	pdcch_vars_th0[eNB_id]->rxdataF_comp[idx]        = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+	pdcch_vars_th0[eNB_id]->dl_ch_rho_ext[idx]       = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+	pdcch_vars_th0[eNB_id]->rxdataF_ext[idx]         = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+	pdcch_vars_th0[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+	
+	pdcch_vars_th1[eNB_id]->rxdataF_comp[idx]        = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+	pdcch_vars_th1[eNB_id]->dl_ch_rho_ext[idx]       = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+	pdcch_vars_th1[eNB_id]->rxdataF_ext[idx]         = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+	pdcch_vars_th1[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+      }
+    }
+    
+    // PBCH
+    pbch_vars[eNB_id]->rxdataF_ext         = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+    pbch_vars[eNB_id]->rxdataF_comp        = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pbch_vars[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+    pbch_vars[eNB_id]->llr                 = (int8_t*)malloc16_clear( 1920 );
+    prach_vars[eNB_id]->prachF             = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
+    prach_vars[eNB_id]->prach              = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
+    
+    for (i=0; i<fp->nb_antennas_rx; i++) {
+      pbch_vars[eNB_id]->rxdataF_ext[i]    = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
+      
+      for (j=0; j<4; j++) {//fp->nb_antennas_tx;j++) {
+	int idx = (j<<1)+i;
+	pbch_vars[eNB_id]->rxdataF_comp[idx]        = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
+	pbch_vars[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
+      }
+    }
+  
+    
     pbch_vars[eNB_id]->decoded_output = (uint8_t*)malloc16_clear( 64 );
   }
 
@@ -1476,16 +1530,12 @@ int init_lte_ue_signal(PHY_VARS_UE *ue,
   pdsch_vars_th1[eNB_id]     = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
   pdsch_vars_SI[eNB_id]  = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
   pdsch_vars_ra[eNB_id]  = (LTE_UE_PDSCH *)malloc16_clear( sizeof(LTE_UE_PDSCH) );
-
-  if (abstraction_flag == 0) {
-    phy_init_lte_ue__PDSCH( pdsch_vars_th0[eNB_id], fp );
-    pdsch_vars_th0[eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
-
-    phy_init_lte_ue__PDSCH( pdsch_vars_th1[eNB_id], fp );
-    pdsch_vars_th1[eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
-  } else { //abstraction == 1
-    ue->sinr_dB = (double*) malloc16_clear( fp->N_RB_DL*12*sizeof(double) );
-  }
+  
+  phy_init_lte_ue__PDSCH( pdsch_vars_th0[eNB_id], fp );
+  pdsch_vars_th0[eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
+  
+  phy_init_lte_ue__PDSCH( pdsch_vars_th1[eNB_id], fp );
+  pdsch_vars_th1[eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
 
   ue->sinr_CQI_dB = (double*) malloc16_clear( fp->N_RB_DL*12*sizeof(double) );
 
@@ -1639,12 +1689,14 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
 {
 
   // shortcuts
-  LTE_DL_FRAME_PARMS* const fp      = &eNB->frame_parms;
-  LTE_eNB_COMMON* const common_vars = &eNB->common_vars;
-  LTE_eNB_PUSCH** const pusch_vars  = eNB->pusch_vars;
-  LTE_eNB_SRS* const srs_vars       = eNB->srs_vars;
-  LTE_eNB_PRACH* const prach_vars   = &eNB->prach_vars;
-
+  LTE_DL_FRAME_PARMS* const fp       = &eNB->frame_parms;
+  LTE_eNB_COMMON* const common_vars  = &eNB->common_vars;
+  LTE_eNB_PUSCH** const pusch_vars   = eNB->pusch_vars;
+  LTE_eNB_SRS* const srs_vars        = eNB->srs_vars;
+  LTE_eNB_PRACH* const prach_vars    = &eNB->prach_vars;
+#ifdef Rel14
+  LTE_eNB_PRACH* const prach_vars_br = &eNB->prach_vars_br;
+#endif
   int i,  eNB_id, UE_id; 
 
 
@@ -1680,55 +1732,61 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
   
 
 
-  if (abstraction_flag==0) {
     
-    common_vars->rxdata  = (int32_t **)NULL;
-    common_vars->txdataF = (int32_t **)malloc16(NB_ANTENNA_PORTS_ENB*sizeof(int32_t*));
-    common_vars->rxdataF = (int32_t **)malloc16(64*sizeof(int32_t*));
-
-    for (i=0; i<NB_ANTENNA_PORTS_ENB; i++) {
-      if (i<fp->nb_antenna_ports_eNB || i==5) {
-	common_vars->txdataF[i] = (int32_t*)malloc16_clear(fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t) );
-
-	LOG_D(PHY,"[INIT] common_vars->txdataF[%d] = %p (%lu bytes)\n",
-	       i,common_vars->txdataF[i],
-	       fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t));
-      }
+  common_vars->rxdata  = (int32_t **)NULL;
+  common_vars->txdataF = (int32_t **)malloc16(NB_ANTENNA_PORTS_ENB*sizeof(int32_t*));
+  common_vars->rxdataF = (int32_t **)malloc16(64*sizeof(int32_t*));
+  
+  for (i=0; i<NB_ANTENNA_PORTS_ENB; i++) {
+    if (i<fp->nb_antenna_ports_eNB || i==5) {
+      common_vars->txdataF[i] = (int32_t*)malloc16_clear(fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t) );
+      
+      LOG_D(PHY,"[INIT] common_vars->txdataF[%d] = %p (%lu bytes)\n",
+	    i,common_vars->txdataF[i],
+	    fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t));
     }
-        
+  }  
+  
+  
+  // Channel estimates for SRS
+  for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
+    
+    srs_vars[UE_id].srs_ch_estimates      = (int32_t**)malloc16( 64*sizeof(int32_t*) );
+    srs_vars[UE_id].srs_ch_estimates_time = (int32_t**)malloc16( 64*sizeof(int32_t*) );
+    
+    for (i=0; i<64; i++) {
+      srs_vars[UE_id].srs_ch_estimates[i]      = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size );
+      srs_vars[UE_id].srs_ch_estimates_time[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
+    }
+  } //UE_id
 
 
-    // Channel estimates for SRS
-    for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
-      
-      srs_vars[UE_id].srs_ch_estimates      = (int32_t**)malloc16( 64*sizeof(int32_t*) );
-      srs_vars[UE_id].srs_ch_estimates_time = (int32_t**)malloc16( 64*sizeof(int32_t*) );
-      
-      for (i=0; i<64; i++) {
-	srs_vars[UE_id].srs_ch_estimates[i]      = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size );
-	srs_vars[UE_id].srs_ch_estimates_time[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2 );
-      }
-    } //UE_id
-  } // abstraction_flag = 0
-  else { //UPLINK abstraction = 1
-    eNB->sinr_dB = (double*) malloc16_clear( fp->N_RB_DL*12*sizeof(double) );
+  generate_ul_ref_sigs_rx();
+  
+  // SRS
+  for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
+    srs_vars[UE_id].srs = (int32_t*)malloc16_clear(2*fp->ofdm_symbol_size*sizeof(int32_t));
   }
 
-  
-  if (abstraction_flag==0) {
-    generate_ul_ref_sigs_rx();
-    
-    // SRS
-    for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
-      srs_vars[UE_id].srs = (int32_t*)malloc16_clear(2*fp->ofdm_symbol_size*sizeof(int32_t));
-    }
-  }
-  
-  
-  
-  
-  
+  // PRACH
   prach_vars->prachF = (int16_t*)malloc16_clear( 1024*2*sizeof(int16_t) );
+
+  // assume maximum of 64 RX antennas for PRACH receiver
+  prach_vars->prach_ifft       = (int16_t***)malloc16_clear(4*sizeof(int32_t**));
+  prach_vars->prach_ifft[0]    = (int16_t**)malloc16_clear(2*sizeof(int32_t*)); 
+  prach_vars->prach_ifft[0][0] = (int16_t*)malloc16_clear(1024*2*sizeof(int32_t));
+  
+  // PRACH BR
+#ifdef Rel14
+  prach_vars_br->prachF = (int16_t*)malloc16_clear( 1024*2*sizeof(int32_t) );
+
+  // assume maximum of 64 RX antennas for PRACH receiver
+  prach_vars_br->prach_ifft    = (int32_t***)malloc16_clear(4*sizeof(int32_t**));
+  for (int ce_level=0;ce_level<4;ce_level++) {
+    prach_vars_br->prach_ifft[ce_level] = (int32_t**)malloc16_clear(64*sizeof(int32_t*)); 
+    for (i=0; i<64; i++) prach_vars_br->prach_ifft[ce_level][i] = (int32_t*)malloc16_clear(1024*2*sizeof(int32_t));
+  }
+#endif
   
   /* number of elements of an array X is computed as sizeof(X) / sizeof(X[0]) 
   AssertFatal(fp->nb_antennas_rx <= sizeof(prach_vars->rxsigF) / sizeof(prach_vars->rxsigF[0]),
@@ -1738,40 +1796,35 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
     LOG_D(PHY,"[INIT] prach_vars->rxsigF[%d] = %p\n",i,prach_vars->rxsigF[i]);
     }*/
   
-
-
-  
   for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
     
     //FIXME
     pusch_vars[UE_id] = (LTE_eNB_PUSCH*)malloc16_clear( NUMBER_OF_UE_MAX*sizeof(LTE_eNB_PUSCH) );
     
-    if (abstraction_flag==0) {
-      pusch_vars[UE_id]->rxdataF_ext      = (int32_t**)malloc16( 2*sizeof(int32_t*) );
-      pusch_vars[UE_id]->rxdataF_ext2     = (int32_t**)malloc16( 2*sizeof(int32_t*) );
-      pusch_vars[UE_id]->drs_ch_estimates = (int32_t**)malloc16( 2*sizeof(int32_t*) );
-      pusch_vars[UE_id]->drs_ch_estimates_time = (int32_t**)malloc16( 2*sizeof(int32_t*) );
-      pusch_vars[UE_id]->rxdataF_comp     = (int32_t**)malloc16( 2*sizeof(int32_t*) );
-      pusch_vars[UE_id]->ul_ch_mag  = (int32_t**)malloc16( 2*sizeof(int32_t*) );
-      pusch_vars[UE_id]->ul_ch_magb = (int32_t**)malloc16( 2*sizeof(int32_t*) );
-
-      AssertFatal(fp->ofdm_symbol_size > 127, "fp->ofdm_symbol_size %d<128\n",fp->ofdm_symbol_size);
-      AssertFatal(fp->symbols_per_tti > 11, "fp->symbols_per_tti %d < 12\n",fp->symbols_per_tti);
-      AssertFatal(fp->N_RB_UL > 5, "fp->N_RB_UL %d < 6\n",fp->N_RB_UL);
-      for (i=0; i<2; i++) {
-	// RK 2 times because of output format of FFT!
-	// FIXME We should get rid of this
-	pusch_vars[UE_id]->rxdataF_ext[i]      = (int32_t*)malloc16_clear( 2*sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
-	pusch_vars[UE_id]->rxdataF_ext2[i]     = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
-	pusch_vars[UE_id]->drs_ch_estimates[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
-	pusch_vars[UE_id]->drs_ch_estimates_time[i] = (int32_t*)malloc16_clear( 2*2*sizeof(int32_t)*fp->ofdm_symbol_size );
-	pusch_vars[UE_id]->rxdataF_comp[i]     = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
-	pusch_vars[UE_id]->ul_ch_mag[i]  = (int32_t*)malloc16_clear( fp->symbols_per_tti*sizeof(int32_t)*fp->N_RB_UL*12 );
-	pusch_vars[UE_id]->ul_ch_magb[i] = (int32_t*)malloc16_clear( fp->symbols_per_tti*sizeof(int32_t)*fp->N_RB_UL*12 );
+    pusch_vars[UE_id]->rxdataF_ext      = (int32_t**)malloc16( 2*sizeof(int32_t*) );
+    pusch_vars[UE_id]->rxdataF_ext2     = (int32_t**)malloc16( 2*sizeof(int32_t*) );
+    pusch_vars[UE_id]->drs_ch_estimates = (int32_t**)malloc16( 2*sizeof(int32_t*) );
+    pusch_vars[UE_id]->drs_ch_estimates_time = (int32_t**)malloc16( 2*sizeof(int32_t*) );
+    pusch_vars[UE_id]->rxdataF_comp     = (int32_t**)malloc16( 2*sizeof(int32_t*) );
+    pusch_vars[UE_id]->ul_ch_mag  = (int32_t**)malloc16( 2*sizeof(int32_t*) );
+    pusch_vars[UE_id]->ul_ch_magb = (int32_t**)malloc16( 2*sizeof(int32_t*) );
+    
+    AssertFatal(fp->ofdm_symbol_size > 127, "fp->ofdm_symbol_size %d<128\n",fp->ofdm_symbol_size);
+    AssertFatal(fp->symbols_per_tti > 11, "fp->symbols_per_tti %d < 12\n",fp->symbols_per_tti);
+    AssertFatal(fp->N_RB_UL > 5, "fp->N_RB_UL %d < 6\n",fp->N_RB_UL);
+    for (i=0; i<2; i++) {
+      // RK 2 times because of output format of FFT!
+      // FIXME We should get rid of this
+      pusch_vars[UE_id]->rxdataF_ext[i]      = (int32_t*)malloc16_clear( 2*sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
+      pusch_vars[UE_id]->rxdataF_ext2[i]     = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
+      pusch_vars[UE_id]->drs_ch_estimates[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
+      pusch_vars[UE_id]->drs_ch_estimates_time[i] = (int32_t*)malloc16_clear( 2*2*sizeof(int32_t)*fp->ofdm_symbol_size );
+      pusch_vars[UE_id]->rxdataF_comp[i]     = (int32_t*)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
+      pusch_vars[UE_id]->ul_ch_mag[i]  = (int32_t*)malloc16_clear( fp->symbols_per_tti*sizeof(int32_t)*fp->N_RB_UL*12 );
+      pusch_vars[UE_id]->ul_ch_magb[i] = (int32_t*)malloc16_clear( fp->symbols_per_tti*sizeof(int32_t)*fp->N_RB_UL*12 );
       }
-      
-      pusch_vars[UE_id]->llr = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
-    } // abstraction_flag
+    
+    pusch_vars[UE_id]->llr = (int16_t*)malloc16_clear( (8*((3*8*6144)+12))*sizeof(int16_t) );
   } //UE_id
 
     
diff --git a/openair1/PHY/LTE_TRANSPORT/dci.c b/openair1/PHY/LTE_TRANSPORT/dci.c
index 551a6b82f0..1ade246945 100755
--- a/openair1/PHY/LTE_TRANSPORT/dci.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci.c
@@ -2123,11 +2123,11 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
 
       if (dci_alloc[i].L == (uint8_t)L) {
 
-	//#ifdef DEBUG_DCI_ENCODING
+#ifdef DEBUG_DCI_ENCODING
         LOG_I(PHY,"Generating DCI %d/%d (nCCE %d) of length %d, aggregation %d (%x)\n",i,num_dci,dci_alloc[i].firstCCE,dci_alloc[i].dci_length,dci_alloc[i].L,
               *(unsigned int*)dci_alloc[i].dci_pdu);
         dump_dci(frame_parms,&dci_alloc[i]);
-	//#endif
+#endif
 
         if (dci_alloc[i].firstCCE>=0) {
           e_ptr = generate_dci0(dci_alloc[i].dci_pdu,
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index 78f141bb5b..d75827db4a 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -882,7 +882,7 @@ int fill_dci_and_dlsch(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC_t *dci_
   dci_alloc->harq_pid = rel8->harq_process;
   dci_alloc->ra_flag  = 0;
 
-  LOG_I(PHY,"NFAPI: DCI format %d, nCCE %d, L %d, rnti %x,harq_pid %d\n",
+  LOG_D(PHY,"NFAPI: DCI format %d, nCCE %d, L %d, rnti %x,harq_pid %d\n",
 	rel8->dci_format,rel8->cce_idx,rel8->aggregation_level,rel8->rnti,rel8->harq_process);
   if ((rel8->rnti_type == 2 ) && (rel8->rnti != SI_RNTI) && (rel8->rnti != P_RNTI)) dci_alloc->ra_flag = 1;
 
@@ -1065,7 +1065,7 @@ int fill_dci_and_dlsch(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC_t *dci_
     if (dlsch0_harq->round == 0)
       dlsch0_harq->status = ACTIVE;
 
-    LOG_I(PHY,"DCI 1A: mcs %d, rballoc %x,rv %d, rnti %x\n",rel8->mcs_1,rel8->resource_block_coding,rel8->redundancy_version_1,rel8->rnti);
+    LOG_D(PHY,"DCI 1A: mcs %d, rballoc %x,rv %d, rnti %x\n",rel8->mcs_1,rel8->resource_block_coding,rel8->redundancy_version_1,rel8->rnti);
 
     break;
   case NFAPI_DL_DCI_FORMAT_1:
@@ -6535,9 +6535,9 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format,
     {
     	if (rnti == tc_rnti) {
 			//fix for standalone Contention Resolution Id
-			pdlsch0_harq->DCINdi = (uint8_t)-1;
-			 LOG_D(PHY,"UE (%x/%d): Format1A DCI: C-RNTI is temporary. Set NDI = %d and to be ignored\n",
-				 rnti,harq_pid,pdlsch0_harq->DCINdi);
+	  pdlsch0_harq->DCINdi = (uint8_t)-1;
+	  LOG_D(PHY,"UE (%x/%d): Format1A DCI: C-RNTI is temporary. Set NDI = %d and to be ignored\n",
+		rnti,harq_pid,pdlsch0_harq->DCINdi);
     	}
 
         // DCI has been toggled or this is the first transmission
diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.c b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
index d832d7498c..1c77083deb 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
@@ -43,12 +43,15 @@ const uint8_t lin2alaw_if4p5[65536] = {213, 213, 213, 213, 213, 213, 213, 213, 2
 
 void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
 
-  LTE_DL_FRAME_PARMS *fp = &ru->frame_parms;
-  int32_t **txdataF      = ru->common.txdataF_BF;
-  int32_t **rxdataF      = ru->common.rxdataF;
-  int16_t **prach_rxsigF = ru->prach_rxsigF;  
-  void *tx_buffer        = ru->ifbuffer.tx[subframe&1];
-  void *tx_buffer_prach  = ru->ifbuffer.tx_prach;
+  LTE_DL_FRAME_PARMS *fp     = &ru->frame_parms;
+  int32_t **txdataF          = ru->common.txdataF_BF;
+  int32_t **rxdataF          = ru->common.rxdataF;
+  int16_t **prach_rxsigF     = ru->prach_rxsigF;  
+#ifdef Rel14
+  int16_t ***prach_rxsigF_br = ru->prach_rxsigF_br;
+#endif
+  void *tx_buffer            = ru->ifbuffer.tx[subframe&1];
+  void *tx_buffer_prach      = ru->ifbuffer.tx_prach;
 
 
   uint16_t symbol_id=0, element_id=0;
@@ -175,7 +178,8 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
 	perror("ETHERNET write for IF4p5_PULFFT\n");
       }
     }
-  } else if (packet_type == IF4p5_PRACH) {
+  } else if (packet_type >= IF4p5_PRACH && 
+	     packet_type <= IF4p5_PRACH+4) {
     // FIX: hard coded prach samples length
     LOG_D(PHY,"IF4p5_PRACH: frame %d, subframe %d\n",frame,subframe);
     db_fulllength = PRACH_NUM_SAMPLES;
@@ -189,13 +193,24 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
     }  
     gen_IF4p5_prach_header(packet_header, frame, subframe);
 
+
+    int16_t *rxF;
+
+#ifdef Rel14
+    if (packet_type > IF4p5_PRACH)
+      rxF = &prach_rxsigF_br[packet_type - IF4p5_PRACH - 1][0][0];
+    else 
+#else
+      rxF = &prach_rxsigF[0][0];
+#endif    
+
     if (eth->flags == ETH_RAW_IF4p5_MODE) {
-      memcpy((int16_t*)(tx_buffer_prach + MAC_HEADER_SIZE_BYTES + sizeof_IF4p5_header_t),
-             (&prach_rxsigF[0][0]), 
-             PRACH_BLOCK_SIZE_BYTES);
+       memcpy((void *)(tx_buffer_prach + MAC_HEADER_SIZE_BYTES + sizeof_IF4p5_header_t),
+              (void*)rxF, 
+              PRACH_BLOCK_SIZE_BYTES);
     } else {
-      memcpy((int16_t*)(tx_buffer_prach + sizeof_IF4p5_header_t),
-             (&prach_rxsigF[0][0]),
+      memcpy((void *)(tx_buffer_prach + sizeof_IF4p5_header_t),
+             (void *)rxF,
              PRACH_BLOCK_SIZE_BYTES);
     }
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_IF, 1 );
@@ -204,7 +219,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
 				     &tx_buffer_prach,
 				     db_fulllength,
 				     1,
-				     IF4p5_PRACH)) < 0) {
+				     packet_type)) < 0) {
       perror("ETHERNET write for IF4p5_PRACH\n");
     }
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_IF, 0 );      
@@ -217,11 +232,14 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
 }
 
 void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint32_t *symbol_number) {
-  LTE_DL_FRAME_PARMS *fp = &ru->frame_parms;
-  int32_t **txdataF      = ru->common.txdataF_BF;
-  int32_t **rxdataF      = ru->common.rxdataF;
-  int16_t **prach_rxsigF = ru->prach_rxsigF;  
-  void *rx_buffer        = ru->ifbuffer.rx;
+  LTE_DL_FRAME_PARMS *fp     = &ru->frame_parms;
+  int32_t **txdataF          = ru->common.txdataF_BF;
+  int32_t **rxdataF          = ru->common.rxdataF;
+  int16_t **prach_rxsigF     = ru->prach_rxsigF;  
+#ifdef Rel14
+  int16_t ***prach_rxsigF_br = ru->prach_rxsigF_br;
+#endif
+  void *rx_buffer            = ru->ifbuffer.rx;
 
   uint16_t element_id;
   uint16_t db_fulllength, db_halflength; 
@@ -308,18 +326,28 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
 	//if (element_id==0) LOG_I(PHY,"recv_if4p5: symbol %d rxdata0 = (%u,%u)\n",*symbol_number,*i,*(i+1));
     }
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_DECOMPR_IF, 0 );		
-  } else if (*packet_type == IF4p5_PRACH) {  
+  } else if (*packet_type >= IF4p5_PRACH &&
+	     *packet_type <= IF4p5_PRACH + 4) {  
 
+    int16_t *rxF;
+    
+#ifdef Rel14
+    if (*packet_type > IF4p5_PRACH)
+      rxF = &prach_rxsigF_br[*packet_type - IF4p5_PRACH - 1][0][0];
+    else 
+#else
+      rxF = &prach_rxsigF[0][0];
+#endif
 
     // FIX: hard coded prach samples length
     db_fulllength = PRACH_NUM_SAMPLES;
 
     if (eth->flags == ETH_RAW_IF4p5_MODE) {		
-      memcpy((&prach_rxsigF[0][0]), 
+      memcpy(rxF, 
              (int16_t*) (rx_buffer+MAC_HEADER_SIZE_BYTES+sizeof_IF4p5_header_t), 
              PRACH_BLOCK_SIZE_BYTES);
     } else {
-      memcpy((&prach_rxsigF[0][0]),
+      memcpy(rxF,
              (int16_t*) (rx_buffer+sizeof_IF4p5_header_t),
              PRACH_BLOCK_SIZE_BYTES);
     }
diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.h b/openair1/PHY/LTE_TRANSPORT/if4_tools.h
index 7a084a4b51..830c580eb0 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.h
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.h
@@ -39,7 +39,11 @@
 #define IF4p5_PULFFT 0x0019 
 #define IF4p5_PDLFFT 0x0020
 #define IF4p5_PRACH 0x0021
-#define IF4p5_PULTICK 0x0022
+#define IF4p5_PRACH_BR_CE0 0x0021
+#define IF4p5_PRACH_BR_CE1 0x0022
+#define IF4p5_PRACH_BR_CE2 0x0023
+#define IF4p5_PRACH_BR_CE3 0x0024
+#define IF4p5_PULTICK 0x0025
 
 struct IF4p5_header {  
   /// Type
diff --git a/openair1/PHY/LTE_TRANSPORT/pbch.c b/openair1/PHY/LTE_TRANSPORT/pbch.c
index cc11afd2dc..603c92d69f 100644
--- a/openair1/PHY/LTE_TRANSPORT/pbch.c
+++ b/openair1/PHY/LTE_TRANSPORT/pbch.c
@@ -210,7 +210,7 @@ int generate_pbch(LTE_eNB_PBCH *eNB_pbch,
     //#ifdef DEBUG_PBCH
 
     for (i=0; i<(PBCH_A>>3); i++)
-      LOG_I(PHY,"[PBCH] pbch_data[%d] = %x\n",i,pbch_a[i]);
+      LOG_D(PHY,"[PBCH] pbch_data[%d] = %x\n",i,pbch_a[i]);
 
     //#endif
 
diff --git a/openair1/PHY/LTE_TRANSPORT/prach.c b/openair1/PHY/LTE_TRANSPORT/prach.c
index fd7f8ab3e0..e616741e13 100644
--- a/openair1/PHY/LTE_TRANSPORT/prach.c
+++ b/openair1/PHY/LTE_TRANSPORT/prach.c
@@ -428,12 +428,14 @@ uint8_t get_prach_fmt(uint8_t prach_ConfigIndex,lte_frame_type_t frame_type)
   }
 }
 
-uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, uint8_t tdd_mapindex, uint16_t Nf) 
+uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, 
+			     uint8_t prach_ConfigIndex, 
+			     uint8_t n_ra_prboffset,
+			     uint8_t tdd_mapindex, uint16_t Nf) 
 {
   lte_frame_type_t frame_type         = frame_parms->frame_type;
   uint8_t tdd_config         = frame_parms->tdd_config;
-  uint8_t prach_ConfigIndex  = frame_parms->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
-  uint8_t n_ra_prboffset     = frame_parms->prach_config_common.prach_ConfigInfo.prach_FreqOffset;
+
   uint8_t n_ra_prb;
   uint8_t f_ra,t1_ra;
   uint8_t prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
@@ -474,92 +476,90 @@ uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, uint8_t tdd_mapind
   return(n_ra_prb);
 }
 
-int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t subframe)
+int is_prach_subframe0(LTE_DL_FRAME_PARMS *frame_parms,uint8_t prach_ConfigIndex,uint32_t frame, uint8_t subframe)
 {
-
-  uint8_t prach_ConfigIndex  = frame_parms->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
+  //  uint8_t prach_ConfigIndex  = frame_parms->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
   uint8_t tdd_config         = frame_parms->tdd_config;
   uint8_t t0_ra;
   uint8_t t1_ra;
   uint8_t t2_ra;
 
+  int prach_mask = 0;
 
   if (frame_parms->frame_type == FDD) { //FDD
     //implement Table 5.7.1-2 from 36.211 (Rel-10, p.41)
     if ((((frame&1) == 1) && (subframe < 9)) ||
         (((frame&1) == 0) && (subframe == 9)))  // This is an odd frame, ignore even-only PRACH frames
+
+      /*
       if (((prach_ConfigIndex&0xf)<3) || // 0,1,2,16,17,18,32,33,34,48,49,50
           ((prach_ConfigIndex&0x1f)==18) || // 18,50
           ((prach_ConfigIndex&0xf)==15))   // 15,47
         return(0);
+      */
 
     switch (prach_ConfigIndex&0x1f) {
     case 0:
     case 3:
-      return(subframe==1);
+      if (subframe==1) prach_mask = 1;
       break;
 
     case 1:
     case 4:
-      return(subframe==4);
+      if (subframe==4) prach_mask = 1;
       break;
 
     case 2:
     case 5:
-      return(subframe==7);
+      if (subframe==7) prach_mask = 1;
       break;
 
     case 6:
-      return((subframe==1) || (subframe==6));
+      if ((subframe==1) || (subframe==6)) prach_mask=1;
       break;
 
     case 7:
-      return((subframe==2) || (subframe==7));
+      if ((subframe==2) || (subframe==7)) prach_mask=1;
       break;
 
     case 8:
-      return((subframe==3) || (subframe==8));
+      if ((subframe==3) || (subframe==8)) prach_mask=1;
       break;
 
     case 9:
-      return((subframe==1) || (subframe==4) || (subframe==7));
+      if ((subframe==1) || (subframe==4) || (subframe==7)) prach_mask=1;
       break;
 
     case 10:
-      return((subframe==2) || (subframe==5) || (subframe==8));
+      if ((subframe==2) || (subframe==5) || (subframe==8)) prach_mask=1;
       break;
 
     case 11:
-      return((subframe==3) || (subframe==6) || (subframe==9));
+      if ((subframe==3) || (subframe==6) || (subframe==9)) prach_mask=1;
       break;
 
     case 12:
-      return((subframe&1)==0);
+      if ((subframe&1)==0) prach_mask=1;
       break;
 
     case 13:
-      return((subframe&1)==1);
+      if ((subframe&1)==1) prach_mask=1;
       break;
 
     case 14:
-      return(1==1);
+      prach_mask=1;
       break;
 
     case 15:
-      return(subframe==9);
+      if (subframe==9) prach_mask=1;
       break;
     }
   } else { // TDD
 
-    if (prach_ConfigIndex>=64) {
-      LOG_E(PHY,"[PHY] Illegal prach_ConfigIndex %d for ",prach_ConfigIndex);
-      return(0);
-    }
-
-    if (tdd_preamble_map[prach_ConfigIndex][tdd_config].num_prach==0) {
-      LOG_E(PHY,"[PHY] Illegal prach_ConfigIndex %d for ",prach_ConfigIndex);
-      return(0);
-    }
+    AssertFatal(prach_ConfigIndex<64,
+		"Illegal prach_ConfigIndex %d for ",prach_ConfigIndex);
+    AssertFatal(tdd_preamble_map[prach_ConfigIndex][tdd_config].num_prach>0,
+		"Illegal prach_ConfigIndex %d for ",prach_ConfigIndex);
 
     t0_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t0_ra;
     t1_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t1_ra;
@@ -576,16 +576,29 @@ int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t su
          (t0_ra == 0)) &&                                // PRACH is in all frames
         (((subframe<5)&&(t1_ra==0)) ||                   // PRACH is in 1st half-frame
          (((subframe>4)&&(t1_ra==1))))) {                // PRACH is in 2nd half-frame
-      if (prach_ConfigIndex<48)                          // PRACH only in normal UL subframe
-        return((((subframe%5)-2)==t2_ra));
-      else                                               // PRACH can be in UpPTS
-        return((((subframe%5)-1)==t2_ra));
-    } else
-      return(1==2);
+      if ((prach_ConfigIndex<48) &&                          // PRACH only in normal UL subframe
+	  (((subframe%5)-2)==t2_ra)) prach_mask=1;
+      else if ((((subframe%5)-1)==t2_ra)) prach_mask=1;      // PRACH can be in UpPTS
+    }
   }
 
-  // shouldn't get here!
-  return(2==1);
+  return(prach_mask);
+}
+
+int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t subframe) {
+  
+  uint8_t prach_ConfigIndex  = frame_parms->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
+  int prach_mask             = is_prach_subframe0(frame_parms,prach_ConfigIndex,frame,subframe);
+
+#ifdef Rel14
+  int i;
+
+  for (i=0;i<4;i++) {
+    if (frame_parms->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i] == 1) 
+      prach_mask|=(is_prach_subframe0(frame_parms,frame_parms->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[i],frame,subframe)<<(i+1));
+  }
+#endif
+  return(prach_mask);
 }
 
 int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint16_t Nf )
@@ -665,7 +678,10 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
     NCS = NCS_restricted[Ncs_config];
   }
 
-  n_ra_prb = get_prach_prb_offset(&(ue->frame_parms), tdd_mapindex, Nf);
+  n_ra_prb = get_prach_prb_offset(&(ue->frame_parms),
+				  ue->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex,
+				  ue->frame_parms.prach_config_common.prach_ConfigInfo.prach_FreqOffset,
+				  tdd_mapindex, Nf);
   prach_root_sequence_map = (prach_fmt<4) ? prach_root_sequence_map0_3 : prach_root_sequence_map4;
 
   /*
@@ -1077,12 +1093,18 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
 }
 //__m128i mmtmpX0,mmtmpX1,mmtmpX2,mmtmpX3;
 
-void rx_prach(PHY_VARS_eNB *eNB,
-	      RU_t *ru,
-	      uint16_t *preamble_energy_list, 
-	      uint16_t *preamble_delay_list, 
-	      uint16_t Nf, 
-	      uint8_t tdd_mapindex)
+void rx_prach0(PHY_VARS_eNB *eNB,
+	       RU_t *ru,
+	       int16_t *max_preamble,
+	       int16_t *max_preamble_energy,
+	       int16_t *max_preamble_delay,
+	       uint16_t Nf, 
+	       uint8_t tdd_mapindex
+#ifdef Rel14
+	       ,uint8_t br_flag,
+	       uint8_t ce_level
+#endif
+	       )
 {
 
   int i;
@@ -1093,45 +1115,14 @@ void rx_prach(PHY_VARS_eNB *eNB,
   uint8_t            prach_ConfigIndex;   
   uint8_t            Ncs_config;          
   uint8_t            restricted_set;      
+  uint8_t            n_ra_prb;
 
   int                subframe;
   int16_t            *prachF=NULL;
   int16_t            **rxsigF=NULL;
-  int16_t            **prach_ifft=NULL;
   int                nb_rx;
 
-  if (ru) { 
-    fp    = &ru->frame_parms;
-    nb_rx = ru->nb_rx;
-  }
-  else if (eNB) {
-    fp    = &eNB->frame_parms;
-    nb_rx = fp->nb_antennas_rx;
-  }
-  else AssertFatal(1==0,"rx_prach called without valid RU or eNB descriptor\n");
-  
-  frame_type          = fp->frame_type;
-  rootSequenceIndex   = fp->prach_config_common.rootSequenceIndex;
-  prach_ConfigIndex   = fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
-  Ncs_config          = fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig;
-  restricted_set      = fp->prach_config_common.prach_ConfigInfo.highSpeedFlag;
-  int16_t *prach[nb_rx];
-
-  if (eNB) {
-    subframe          = eNB->proc.subframe_prach;
-    prachF            = eNB->prach_vars.prachF;
-    rxsigF            = eNB->prach_vars.rxsigF;
-    prach_ifft        = eNB->prach_vars.prach_ifft;
-  }
-  else {
-    subframe          = ru->proc.subframe_prach;
-    rxsigF            = ru->prach_rxsigF;
-    LOG_D(PHY,"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
-	  subframe,fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,prach_ConfigIndex);
-  }
-
   int16_t *prach2;
-  uint8_t n_ra_prb;
   uint8_t preamble_index;
   uint16_t NCS,NCS2;
   uint16_t preamble_offset=0,preamble_offset_old;
@@ -1155,15 +1146,100 @@ void rx_prach(PHY_VARS_eNB *eNB,
   int32_t lev;
   int16_t levdB;
   int fft_size,log2_ifft_size;
-
-
+  int16_t prach_ifft_tmp[2048*2] __attribute__((aligned(32)));
+  int32_t *prach_ifft;
+  int32_t **prach_ifftp;
+#ifdef Rel14
+  int prach_ifft_cnt=0;
+#endif
 #ifdef PRACH_DEBUG
   int en,en0=0;
 #endif
 
+  if (ru) { 
+    fp    = &ru->frame_parms;
+    nb_rx = ru->nb_rx;
+  }
+  else if (eNB) {
+    fp    = &eNB->frame_parms;
+    nb_rx = fp->nb_antennas_rx;
+  }
+  else AssertFatal(1==0,"rx_prach called without valid RU or eNB descriptor\n");
+  
+  frame_type          = fp->frame_type;
+
+#ifdef Rel14
+  if (br_flag == 1) {
+    AssertFatal(fp->prach_emtc_config_common.prach_Config_enabled==1,
+		"emtc prach_Config is not enabled\n");
+    AssertFatal(fp->prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1,
+		"ce_level %d is not active\n",ce_level);
+    rootSequenceIndex   = fp->prach_emtc_config_common.rootSequenceIndex;
+    prach_ConfigIndex   = fp->prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[ce_level];
+    Ncs_config          = fp->prach_emtc_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig;
+    restricted_set      = fp->prach_emtc_config_common.prach_ConfigInfo.highSpeedFlag;
+    n_ra_prb            = get_prach_prb_offset(fp,prach_ConfigIndex,
+					       fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],
+					       tdd_mapindex,Nf);
+    // update pointers to results for ce_level
+    max_preamble        += ce_level;
+    max_preamble_energy += ce_level;
+    max_preamble_delay  += ce_level;
+  }
+  else 
+#endif
+    {
+      rootSequenceIndex   = fp->prach_config_common.rootSequenceIndex;
+      prach_ConfigIndex   = fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
+      Ncs_config          = fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig;
+      restricted_set      = fp->prach_config_common.prach_ConfigInfo.highSpeedFlag;
+      n_ra_prb            = get_prach_prb_offset(fp,prach_ConfigIndex,
+						 fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,
+						 tdd_mapindex,Nf);
+    }
+
+  int16_t *prach[nb_rx];
+  
+  if (eNB) {
+#ifdef Rel14
+    if (br_flag == 1) {
+      prach_ifftp         = eNB->prach_vars_br.prach_ifft[ce_level];
+      subframe            = eNB->proc.subframe_prach_br;
+      prachF              = eNB->prach_vars_br.prachF;
+      rxsigF              = eNB->prach_vars_br.rxsigF;
+    }
+    else
+#endif
+      {
+        prach_ifftp       = eNB->prach_vars.prach_ifft[0];
+        subframe          = eNB->proc.subframe_prach;
+        prachF            = eNB->prach_vars.prachF;
+        rxsigF            = eNB->prach_vars.rxsigF;
+      }
+  }
+  else {
+#ifdef Rel14
+    if (br_flag == 1) {
+        subframe          = ru->proc.subframe_prach_br;
+        rxsigF            = ru->prach_rxsigF_br[ce_level];
+        LOG_D(PHY,"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
+	      subframe,fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],prach_ConfigIndex);
+    }
+    else
+#endif
+      {
+        subframe          = ru->proc.subframe_prach;
+        rxsigF            = ru->prach_rxsigF;
+        LOG_D(PHY,"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
+	      subframe,fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,prach_ConfigIndex);
+      }
+
+  }
+
+  AssertFatal(ru!=NULL,"ru is null\n");
+
   for (aa=0; aa<nb_rx; aa++) {
-    if ((eNB==NULL) && 
-	(ru!=NULL)) { 
+    if (ru->if_south == LOCAL_RF) { // set the time-domain signal if we have to use it in this node
       prach[aa] = (int16_t*)&ru->common.rxdata[aa][(subframe*fp->samples_per_tti)-ru->N_TA_offset];
 #ifdef PRACH_DEBUG
       LOG_D(PHY,"RU %d, subframe %d, : prach %p (energy %d)\n",ru->idx,subframe,prach[aa],dB_fixed(en0=signal_energy(prach[aa],fp->samples_per_tti))); 
@@ -1184,7 +1260,7 @@ void rx_prach(PHY_VARS_eNB *eNB,
 
   if (eNB) start_meas(&eNB->rx_prach);
 
-  n_ra_prb = get_prach_prb_offset(fp,tdd_mapindex,Nf);
+
   prach_root_sequence_map = (prach_fmt < 4) ? prach_root_sequence_map0_3 : prach_root_sequence_map4;
 
   // PDP is oversampled, e.g. 1024 sample instead of 839
@@ -1246,11 +1322,12 @@ void rx_prach(PHY_VARS_eNB *eNB,
   }
 
 
-  if (((eNB!=NULL) && (ru!=NULL) && (ru->function != NGFI_RAU_IF4p5))||
-      ((eNB==NULL) && (ru!=NULL) && (ru->function == NGFI_RRU_IF4p5))) { // compute the DFTs of the PRACH temporal resources
+  if (((eNB!=NULL) && (ru->function != NGFI_RAU_IF4p5))||
+      ((eNB==NULL) && (ru->function == NGFI_RRU_IF4p5))) { // compute the DFTs of the PRACH temporal resources
     // Do forward transform
     LOG_D(PHY,"rx_prach: Doing FFT for N_RB_UL %d\n",fp->N_RB_UL);
     for (aa=0; aa<nb_rx; aa++) {
+      AssertFatal(prach[aa]!=NULL,"prach[%d] is null\n",aa);
       prach2 = prach[aa] + (Ncp<<1);
   
       // do DFT
@@ -1368,8 +1445,13 @@ void rx_prach(PHY_VARS_eNB *eNB,
 
   if ((eNB==NULL) && (ru!=NULL) && ru->function == NGFI_RRU_IF4p5) {
 
-    /// **** send_IF4 of rxsigF to RAU **** ///    
-    send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH);
+    /// **** send_IF4 of rxsigF to RAU **** ///
+#ifdef Rel14
+    if (br_flag == 1) send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH+1+ce_level);      
+
+    else
+#endif
+      send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH);
     
 #if 0
     if (dB_fixed(en0)>30) {
@@ -1399,6 +1481,30 @@ void rx_prach(PHY_VARS_eNB *eNB,
 
   preamble_offset_old = 99;
 
+  uint8_t update_TA  = 4;
+  uint8_t update_TA2 = 1;
+  switch (eNB->frame_parms.N_RB_DL) {
+  case 6:
+    update_TA = 16;
+    break;
+    
+  case 25:
+    update_TA = 4;
+    break;
+    
+  case 50:
+    update_TA = 2;
+    break;
+    
+  case 75:
+    update_TA  = 3;
+    update_TA2 = 2;
+  case 100:
+    update_TA  = 1;
+    break;
+  }
+  
+  *max_preamble_energy=0;
   for (preamble_index=0 ; preamble_index<64 ; preamble_index++) {
     if (restricted_set == 0) {
       // This is the relative offset in the root sequence table (5.7.2-4 from 36.211) for the given preamble index
@@ -1491,10 +1597,20 @@ void rx_prach(PHY_VARS_eNB *eNB,
     if (new_dft == 1) {
       new_dft = 0;
       Xu=(int16_t*)eNB->X_u[preamble_offset-first_nonzero_root_idx];
-      
 
+#ifdef Rel14
+      if (br_flag == 1) {
+	prach_ifft = prach_ifftp[prach_ifft_cnt++];
+	if (eNB->prach_vars_br.repetition_number[ce_level]==1) memset(prach_ifft,0,((N_ZC==839)?2048:256)*sizeof(int32_t));
+      }
+      else
+#endif
+	{
+	  prach_ifft = prach_ifftp[0];
+          memset(prach_ifft,0,((N_ZC==839) ? 2048 : 256)*sizeof(int32_t));
+	}
 
-      memset( prachF, 0, sizeof(int16_t)*2*1024 );
+      memset(prachF, 0, sizeof(int16_t)*2*1024 );
 #ifdef PRACH_DEBUG
       if (prach[0]!= NULL) write_output("prach_rx0.m","prach_rx0",prach[0],6144+792,1,1);
 #endif
@@ -1503,7 +1619,7 @@ void rx_prach(PHY_VARS_eNB *eNB,
       // write_output("prach_rxF1.m","prach_rxF1",rxsigF[1],6144,1,1);
 
       for (aa=0;aa<nb_rx; aa++) {
-      // Do componentwise product with Xu*
+      // Do componentwise product with Xu* on each antenna 
 
 	k=0;	
 	for (offset=0; offset<(N_ZC<<1); offset+=2) {
@@ -1517,11 +1633,18 @@ void rx_prach(PHY_VARS_eNB *eNB,
 	// Now do IFFT of size 1024 (N_ZC=839) or 256 (N_ZC=139)
 	if (N_ZC == 839) {
 	  log2_ifft_size = 10;
-	  idft1024(prachF,prach_ifft[aa],1);
+	  idft1024(prachF,prach_ifft_tmp,1);
+	  // compute energy and accumulate over receive antennas and repetitions for BR
+	  for (i=0;i<2048;i++)
+	    prach_ifft[i] += (prach_ifft_tmp[i<<1]*prach_ifft_tmp[i<<1] + prach_ifft_tmp[1+(i<<1)]*prach_ifft_tmp[1+(i<<1)])>>15;
 	} else {
-	  idft256(prachF,prach_ifft[aa],1);
+	  idft256(prachF,prach_ifft_tmp,1);
 	  log2_ifft_size = 8;
+	  // compute energy and accumulate over receive antennas and repetitions for BR
+	  for (i=0;i<256;i++)
+	    prach_ifft[i] += (prach_ifft_tmp[i<<1]*prach_ifft_tmp[(i<<1)] + prach_ifft_tmp[1+(i<<1)]*prach_ifft_tmp[1+(i<<1)])>>15;
 	}
+	
 #ifdef PRACH_DEBUG
 	if (aa==0) write_output("prach_rxF_comp0.m","prach_rxF_comp0",prachF,1024,1,1);
 #endif
@@ -1542,41 +1665,84 @@ void rx_prach(PHY_VARS_eNB *eNB,
 	write_output("rxsigF.m","prach_rxF",&rxsigF[0][0],12288,1,1);
 	write_output("prach_rxF_comp0.m","prach_rxF_comp0",prachF,1024,1,1);
 	write_output("Xu.m","xu",Xu,N_ZC,1,1);
-	write_output("prach_ifft0.m","prach_t0",prach_ifft[0],1024,1,1);
+	write_output("prach_ifft0.m","prach_t0",prach_ifft[0][0],1024,1,1);
 	exit(-1);
       }
 #endif
     } // new dft
     
-    // check energy in nth time shift
-    preamble_shift2 = ((preamble_shift==0) ? 0 : ((preamble_shift<<log2_ifft_size)/N_ZC));
-    preamble_energy_list[preamble_index] = 0;
+    // check energy in nth time shift, for 
+#ifdef Rel14
+    if ((br_flag==0) ||
+	(eNB->prach_vars_br.repetition_number[ce_level]==
+	 eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level]))
+#endif
+      {
+	preamble_shift2 = ((preamble_shift==0) ? 0 : ((preamble_shift<<log2_ifft_size)/N_ZC));
+
     
-    for (i=0; i<NCS2; i++) {
-      lev = 0;
-      
-      for (aa=0; aa<nb_rx; aa++) {
-	lev += (int32_t)prach_ifft[aa][(preamble_shift2+i)<<1]*prach_ifft[aa][(preamble_shift2+i)<<1] + (int32_t)prach_ifft[aa][1+((preamble_shift2+i)<<1)]*prach_ifft[aa][1+((preamble_shift2+i)<<1)];
+	for (i=0; i<NCS2; i++) {
+	  lev = (int32_t)prach_ifft[(preamble_shift2+i)<<1];
+	  levdB = dB_fixed_times10(lev);
+	  
+	  if (levdB>*max_preamble_energy) {
+	    *max_preamble_energy  = levdB;
+	    *max_preamble_delay   = ((i*fft_size)>>log2_ifft_size)*update_TA/update_TA2;
+	    *max_preamble         = preamble_index;
+	  }
+	}
       }
-     
-      levdB = dB_fixed_times10(lev);
-      
-      if (levdB>preamble_energy_list[preamble_index] ) {
-	preamble_energy_list[preamble_index]  = levdB;
-	preamble_delay_list[preamble_index]   = (i*fft_size)>>log2_ifft_size;
+  }// preamble_index
+
+  if (eNB) stop_meas(&eNB->rx_prach);
+
+}
+
+
+
+#ifndef Rel14
+#define rx_prach rx_prach0
+#else
+void rx_prach(PHY_VARS_eNB *eNB,
+	      RU_t *ru,
+	      uint16_t *max_preamble,
+	      uint16_t *max_preamble_energy,
+	      uint16_t *max_preamble_delay,
+	      uint16_t Nf, 
+	      uint8_t tdd_mapindex,
+	      uint8_t br_flag) {
+
+  int i;
+  int prach_mask=0;
+
+  if (br_flag == 0) { 
+    rx_prach0(eNB,ru,max_preamble,max_preamble_energy,max_preamble_delay,Nf,tdd_mapindex,0,0);
+  }
+  else { // This is procedure for eMTC, basically handling the repetitions
+    prach_mask = is_prach_subframe(&eNB->frame_parms,eNB->proc.frame_prach_br,eNB->proc.subframe_prach_br);
+    for (i=0;i<4;i++) {
+      if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i]==1) &&
+	  ((prach_mask&(1<<(i+1))) > 0)) { // check that prach CE level is active now
+
+	// if first reception in group of repetitions store frame for later (in RA-RNTI for Msg2) 
+	if (eNB->prach_vars_br.repetition_number[i]==0) eNB->prach_vars_br.first_frame[i]=eNB->proc.frame_prach_br;
+
+	// increment repetition number
+	eNB->prach_vars_br.repetition_number[i]++;
+
+	// do basic PRACH reception
+	rx_prach0(eNB,ru,max_preamble,max_preamble_energy,max_preamble_delay,Nf,tdd_mapindex,1,i);
+	
+	// if last repetition, clear counter
+	if (eNB->prach_vars_br.repetition_number[i] == eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[i]) {
+	  eNB->prach_vars_br.repetition_number[i]=0;
+
+	}
       }
     }
-#ifdef PRACH_DEBUG
-    LOG_D(PHY,"[RAPROC] Preamble %d => %d dB, %d (shift %d (%d), NCS2 %d(%d), Ncp %d)\n",preamble_index,preamble_energy_list[preamble_index],preamble_delay_list[preamble_index],preamble_shift2,
-	  preamble_shift, NCS2,NCS,Ncp);
-    //  exit(-1);
-#endif
-
-  }// preamble_index
-  
-  if (eNB) stop_meas(&eNB->rx_prach);
-  
+  }
 }
+#endif
 
 void init_prach_tables(int N_ZC)
 {
diff --git a/openair1/PHY/LTE_TRANSPORT/proto.h b/openair1/PHY/LTE_TRANSPORT/proto.h
index c1e3148ee4..024da7a810 100644
--- a/openair1/PHY/LTE_TRANSPORT/proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/proto.h
@@ -2074,14 +2074,21 @@ int32_t generate_prach(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t subframe,
   \brief Process PRACH waveform
   @param phy_vars_eNB Pointer to eNB top-level descriptor. If NULL, then this is an RRU
   @param ru Pointer to RU top-level descriptor. If NULL, then this is an eNB and we make use of the RU_list
-  @param preamble_energy_list List of energies for each candidate preamble
-  @param preamble_delay_list List of delays for each candidate preamble
+  @param max_preamble most likely preamble
+  @param max_preamble_energy Estimated Energy of most likely preamble
+  @param max_preamble_delay Estimated Delay of most likely preamble
   @param Nf System frame number
   @param tdd_mapindex Index of PRACH resource in Table 5.7.1-4 (TDD)
+  @param br_flag indicator to act on eMTC PRACH
   @returns 0 on success
 
 */
-void rx_prach(PHY_VARS_eNB *phy_vars_eNB,RU_t *ru,uint16_t *preamble_energy_list, uint16_t *preamble_delay_list, uint16_t Nf, uint8_t tdd_mapindex);
+void rx_prach(PHY_VARS_eNB *phy_vars_eNB,RU_t *ru,
+	      uint16_t *max_preamble, 
+	      uint16_t *max_preamble_energy, 
+	      uint16_t *max_preamble_delay, 
+	      uint16_t Nf, uint8_t tdd_mapindex,
+	      uint8_t br_flag);
 
 /*!
   \brief Helper for MAC, returns number of available PRACH in TDD for a particular configuration index
@@ -2169,7 +2176,10 @@ double computeRhoB_UE(PDSCH_CONFIG_DEDICATED  *pdsch_config_dedicated,
   LTE_UE_DLSCH_t *dlsch_ue);
 */
 
-uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, uint8_t tdd_mapindex, uint16_t Nf);
+uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, 
+			     uint8_t prach_ConfigIndex, 
+			     uint8_t n_ra_prboffset,
+			     uint8_t tdd_mapindex, uint16_t Nf);
 
 uint8_t ul_subframe2pdcch_alloc_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n);
 
diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h
index 13c4ce22b4..22df648149 100644
--- a/openair1/PHY/defs.h
+++ b/openair1/PHY/defs.h
@@ -288,6 +288,10 @@ typedef struct RU_proc_t_s {
   int subframe_tx;
   /// subframe to act upon for reception of prach
   int subframe_prach;
+#ifdef Rel14
+  /// subframe to act upon for reception of prach BL/CE UEs
+  int subframe_prach_br;
+#endif
   /// frame to act upon for reception
   int frame_rx;
   /// frame to act upon for transmission
@@ -296,6 +300,10 @@ typedef struct RU_proc_t_s {
   int frame_tx_unwrap;
   /// frame to act upon for reception of prach
   int frame_prach;
+#ifdef Rel14
+  /// frame to act upon for reception of prach
+  int frame_prach_br;
+#endif
   /// frame offset for slave RUs (to correct for frame asynchronism at startup)
   int frame_offset;
   /// \brief Instance count for FH processing thread.
@@ -303,6 +311,10 @@ typedef struct RU_proc_t_s {
   int instance_cnt_FH;
   /// \internal This variable is protected by \ref mutex_prach.
   int instance_cnt_prach;
+#ifdef Rel14
+  /// \internal This variable is protected by \ref mutex_prach.
+  int instance_cnt_prach_br;
+#endif
   /// \internal This variable is protected by \ref mutex_synch.
   int instance_cnt_synch;
   /// \internal This variable is protected by \ref mutex_eNBs.
@@ -316,6 +328,10 @@ typedef struct RU_proc_t_s {
   pthread_t pthread_FH;
   /// pthread structure for RU prach processing thread
   pthread_t pthread_prach;
+#ifdef Rel14
+  /// pthread structure for RU prach processing thread BL/CE UEs
+  pthread_t pthread_prach_br;
+#endif
   /// pthread struct for RU synch thread
   pthread_t pthread_synch;
   /// pthread struct for RU RX FEP thread
@@ -330,6 +346,10 @@ typedef struct RU_proc_t_s {
   pthread_attr_t attr_FH;
   /// pthread attributes for RU prach
   pthread_attr_t attr_prach;
+#ifdef Rel14
+  /// pthread attributes for RU prach BL/CE UEs
+  pthread_attr_t attr_prach_br;
+#endif
   /// pthread attributes for RU synch thread
   pthread_attr_t attr_synch;
   /// pthread attributes for asynchronous RX thread
@@ -340,6 +360,10 @@ typedef struct RU_proc_t_s {
   struct sched_param sched_param_FH;
   /// scheduling parameters for RU prach thread
   struct sched_param sched_param_prach;
+#ifdef Rel14
+  /// scheduling parameters for RU prach thread BL/CE UEs
+  struct sched_param sched_param_prach_br;
+#endif
   /// scheduling parameters for RU synch thread
   struct sched_param sched_param_synch;
   /// scheduling parameters for asynch_rxtx thread
@@ -348,6 +372,10 @@ typedef struct RU_proc_t_s {
   pthread_cond_t cond_FH;
   /// condition variable for RU prach thread
   pthread_cond_t cond_prach;
+#ifdef Rel14
+  /// condition variable for RU prach thread BL/CE UEs
+  pthread_cond_t cond_prach_br;
+#endif
   /// condition variable for RU synch thread
   pthread_cond_t cond_synch;
   /// condition variable for asynch RX/TX thread
@@ -360,6 +388,10 @@ typedef struct RU_proc_t_s {
   pthread_mutex_t mutex_FH;
   /// mutex for RU prach
   pthread_mutex_t mutex_prach;
+#ifdef Rel14
+  /// mutex for RU prach BL/CE UEs
+  pthread_mutex_t mutex_prach_br;
+#endif
   /// mutex for RU synch
   pthread_mutex_t mutex_synch;
   /// mutex for eNB signal
@@ -390,20 +422,30 @@ typedef struct eNB_proc_t_s {
   int subframe_rx;
   /// subframe to act upon for PRACH
   int subframe_prach;
+#ifdef Rel14
+  /// subframe to act upon for reception of prach BL/CE UEs
+  int subframe_prach_br;
+#endif
   /// frame to act upon for reception
   int frame_rx;
   /// frame to act upon for transmission
   int frame_tx;
   /// frame to act upon for PRACH
   int frame_prach;
+#ifdef Rel14
+  /// frame to act upon for PRACH BL/CE UEs
+  int frame_prach_br;
+#endif
   /// \internal This variable is protected by \ref mutex_td.
   int instance_cnt_td;
   /// \internal This variable is protected by \ref mutex_te.
   int instance_cnt_te;
-  /// \brief Instance count for FH processing thread.
-  /// \brief Instance count for rx processing thread.
   /// \internal This variable is protected by \ref mutex_prach.
   int instance_cnt_prach;
+#ifdef Rel14
+  /// \internal This variable is protected by \ref mutex_prach for BL/CE UEs.
+  int instance_cnt_prach_br;
+#endif
   // instance count for over-the-air eNB synchronization
   int instance_cnt_synch;
   /// \internal This variable is protected by \ref mutex_asynch_rxtx.
@@ -424,6 +466,10 @@ typedef struct eNB_proc_t_s {
   pthread_attr_t attr_single;
   /// pthread attributes for prach processing thread
   pthread_attr_t attr_prach;
+#ifdef Rel14
+  /// pthread attributes for prach processing thread BL/CE UEs
+  pthread_attr_t attr_prach_br;
+#endif
   /// pthread attributes for asynchronous RX thread
   pthread_attr_t attr_asynch_rxtx;
   /// scheduling parameters for parallel turbo-decoder thread
@@ -434,6 +480,10 @@ typedef struct eNB_proc_t_s {
   struct sched_param sched_param_single;
   /// scheduling parameters for prach thread
   struct sched_param sched_param_prach;
+#ifdef Rel14
+  /// scheduling parameters for prach thread
+  struct sched_param sched_param_prach_br;
+#endif
   /// scheduling parameters for asynch_rxtx thread
   struct sched_param sched_param_asynch_rxtx;
   /// pthread structure for parallel turbo-decoder thread
@@ -442,12 +492,20 @@ typedef struct eNB_proc_t_s {
   pthread_t pthread_te;
   /// pthread structure for PRACH thread
   pthread_t pthread_prach;
+#ifdef Rel14
+  /// pthread structure for PRACH thread BL/CE UEs
+  pthread_t pthread_prach_br;
+#endif
   /// condition variable for parallel turbo-decoder thread
   pthread_cond_t cond_td;
   /// condition variable for parallel turbo-encoder thread
   pthread_cond_t cond_te;
   /// condition variable for PRACH processing thread;
   pthread_cond_t cond_prach;
+#ifdef Rel14
+  /// condition variable for PRACH processing thread BL/CE UEs;
+  pthread_cond_t cond_prach_br;
+#endif
   /// condition variable for asynch RX/TX thread
   pthread_cond_t cond_asynch_rxtx;
   /// mutex for parallel turbo-decoder thread
@@ -456,16 +514,26 @@ typedef struct eNB_proc_t_s {
   pthread_mutex_t mutex_te;
   /// mutex for PRACH thread
   pthread_mutex_t mutex_prach;
+#ifdef Rel14
+  /// mutex for PRACH thread for BL/CE UEs
+  pthread_mutex_t mutex_prach_br;
+#endif
   /// mutex for asynch RX/TX thread
   pthread_mutex_t mutex_asynch_rxtx;
   /// mutex for RU access to eNB processing (PDSCH/PUSCH)
   pthread_mutex_t mutex_RU;
   /// mutex for RU access to eNB processing (PRACH)
   pthread_mutex_t mutex_RU_PRACH;
+  /// mutex for RU access to eNB processing (PRACH BR)
+  pthread_mutex_t mutex_RU_PRACH_br;
   /// mask for RUs serving eNB (PDSCH/PUSCH)
   int RU_mask;
   /// mask for RUs serving eNB (PRACH)
   int RU_mask_prach;
+#ifdef Rel14
+  /// mask for RUs serving eNB (PRACH)
+  int RU_mask_prach_br;
+#endif
   /// parameters for turbo-decoding worker thread
   td_params tdp;
   /// parameters for turbo-encoding worker thread
@@ -631,6 +699,8 @@ typedef struct RU_t_s{
   int (*wakeup_rxtx)(struct PHY_VARS_eNB_s *eNB,int frame_rx,int subframe_rx);
   /// function pointer to wakeup routine in lte-enb.
   int (*wakeup_prach_eNB)(struct PHY_VARS_eNB_s *eNB,struct RU_t_s *ru,int frame,int subframe);
+  /// function pointer to wakeup routine in lte-enb.
+  int (*wakeup_prach_eNB_br)(struct PHY_VARS_eNB_s *eNB,struct RU_t_s *ru,int frame,int subframe);
   /// function pointer to eNB entry routine
   void (*eNB_top)(struct PHY_VARS_eNB_s *eNB, int frame_rx, int subframe_rx, char *string);
   /// Timing statistics
@@ -642,6 +712,8 @@ typedef struct RU_t_s{
 
   /// received frequency-domain signal for PRACH (IF4p5 RRU) 
   int16_t              **prach_rxsigF;
+  /// received frequency-domain signal for PRACH BR (IF4p5 RRU) 
+  int16_t              **prach_rxsigF_br[4];
   /// sequence number for IF5
   uint8_t seqno;
   /// initial timestamp used as an offset make first real timestamp 0
@@ -829,12 +901,23 @@ typedef struct PHY_VARS_eNB_s {
   IF_Module_t          *if_inst;
   UL_IND_t             UL_INFO;
   pthread_mutex_t      UL_INFO_mutex;
+  /// NFAPI RX ULSCH information
   nfapi_rx_indication_pdu_t  rx_pdu_list[NFAPI_RX_IND_MAX_PDU];
+  /// NFAPI RX ULSCH CRC information
   nfapi_crc_indication_pdu_t crc_pdu_list[NFAPI_CRC_IND_MAX_PDU];
+  /// NFAPI PRACH information
+  nfapi_preamble_pdu_t preamble_list[MAX_NUM_RX_PRACH_PREAMBLES];
+#ifdef Rel14
+  /// NFAPI PRACH information BL/CE UEs
+  nfapi_preamble_pdu_t preamble_list_br[MAX_NUM_RX_PRACH_PREAMBLES];
+#endif
   Sched_Rsp_t          Sched_INFO;
   LTE_eNB_PDCCH        pdcch_vars[2];
+#ifdef Rel14
   LTE_eNB_EPDCCH       epdcch_vars[2];
   LTE_eNB_MPDCCH       mpdcch_vars[2];
+  LTE_eNB_PRACH        prach_vars_br;
+#endif
   LTE_eNB_COMMON       common_vars;
   LTE_eNB_SRS          srs_vars[NUMBER_OF_UE_MAX];
   LTE_eNB_PBCH         pbch;
@@ -1364,6 +1447,13 @@ typedef struct RRU_config_s {
   int prach_FreqOffset[MAX_BANDS_PER_RRU];
   /// prach_ConfigIndex for IF4p5
   int prach_ConfigIndex[MAX_BANDS_PER_RRU];
+#ifdef Rel14
+  int emtc_prach_CElevel_enable[MAX_BANDS_PER_RRU][4];
+  /// emtc_prach_FreqOffset for IF4p5 per CE Level
+  int emtc_prach_FreqOffset[MAX_BANDS_PER_RRU][4];
+  /// emtc_prach_ConfigIndex for IF4p5 per CE Level
+  int emtc_prach_ConfigIndex[MAX_BANDS_PER_RRU][4];
+#endif
 } RRU_config_t;
 
 
diff --git a/openair1/PHY/impl_defs_lte.h b/openair1/PHY/impl_defs_lte.h
index 4e6600acba..c0810f49f8 100644
--- a/openair1/PHY/impl_defs_lte.h
+++ b/openair1/PHY/impl_defs_lte.h
@@ -56,6 +56,8 @@
 
 #define MAX_MBSFN_AREA 8
 
+#define NB_RX_ANTENNAS_MAX 64
+
 #ifdef OCP_FRAMEWORK
 #include "enums.h"
 #else
@@ -99,6 +101,8 @@ typedef struct {
   uint8_t prach_FreqOffset;
 } PRACH_CONFIG_INFO;
 
+
+
 /// PRACH-ConfigSIB or PRACH-Config from 36.331 RRC spec
 typedef struct {
   /// Parameter: RACH_ROOT_SEQUENCE, see TS 36.211 (5.7.1). \vr{[0..837]}
@@ -109,6 +113,44 @@ typedef struct {
   PRACH_CONFIG_INFO prach_ConfigInfo;
 } PRACH_CONFIG_COMMON;
 
+#ifdef Rel14
+
+/// PRACH-eMTC-Config from 36.331 RRC spec
+typedef struct {
+  /// Parameter: High-speed-flag, see TS 36.211 (5.7.2). \vr{[0..1]} 1 corresponds to Restricted set and 0 to Unrestricted set.
+  uint8_t highSpeedFlag;
+/// Parameter: \f$N_\text{CS}\f$, see TS 36.211 (5.7.2). \vr{[0..15]}\n Refer to table 5.7.2-2 for preamble format 0..3 and to table 5.7.2-3 for preamble format 4.
+  uint8_t zeroCorrelationZoneConfig;
+  /// Parameter: prach-FrequencyOffset, see TS 36.211 (5.7.1). \vr{[0..94]}\n For TDD the value range is dependent on the value of \ref prach_ConfigIndex.
+
+  /// PRACH starting subframe periodicity, expressed in number of subframes available for preamble transmission (PRACH opportunities), see TS 36.211. Value 2 corresponds to 2 subframes, 4 corresponds to 4 subframes and so on. EUTRAN configures the PRACH starting subframe periodicity larger than or equal to the Number of PRACH repetitions per attempt for each CE level (numRepetitionPerPreambleAttempt).
+  uint8_t prach_starting_subframe_periodicity[4];
+  /// number of repetitions per preamble attempt per CE level
+  uint8_t prach_numRepetitionPerPreambleAttempt[4];
+  /// prach configuration index for each CE level
+  uint8_t prach_ConfigIndex[4];
+  /// indicator for CE level activation
+  uint8_t prach_CElevel_enable[4];
+  /// prach frequency offset for each CE level 
+  uint8_t prach_FreqOffset[4];
+  /// indicator for CE level hopping activation
+  uint8_t prach_hopping_enable[4];
+  /// indicator for CE level hopping activation
+  uint8_t prach_hopping_offset[4];
+} PRACH_eMTC_CONFIG_INFO;
+
+#endif
+
+/// PRACH-ConfigSIB or PRACH-Config from 36.331 RRC spec
+typedef struct {
+  /// Parameter: RACH_ROOT_SEQUENCE, see TS 36.211 (5.7.1). \vr{[0..837]}
+  uint16_t rootSequenceIndex;
+  /// prach_Config_enabled=1 means enabled. \vr{[0..1]}
+  uint8_t prach_Config_enabled;
+  /// PRACH Configuration Information
+  PRACH_eMTC_CONFIG_INFO prach_ConfigInfo;
+} PRACH_eMTC_CONFIG_COMMON;
+
 /// Enumeration for parameter \f$N_\text{ANRep}\f$ \ref PUCCH_CONFIG_DEDICATED::repetitionFactor.
 typedef enum {
   n2=0,
@@ -546,6 +588,10 @@ typedef struct {
   uint8_t nb_antenna_ports_eNB;
   /// PRACH_CONFIG
   PRACH_CONFIG_COMMON prach_config_common;
+#ifdef Rel14
+  /// PRACH_eMTC_CONFIG
+  PRACH_eMTC_CONFIG_COMMON prach_emtc_config_common;
+#endif
   /// PUCCH Config Common (from 36-331 RRC spec)
   PUCCH_CONFIG_COMMON pucch_config_common;
   /// PDSCH Config Common (from 36-331 RRC spec)
@@ -1138,13 +1184,19 @@ typedef struct {
   /// \brief ?.
   /// first index: rx antenna [0..63] (hard coded) \note Hard coded array size indexed by \c nb_antennas_rx.
   /// second index: ? [0..ofdm_symbol_size*12[
-  int16_t *rxsigF[64];
+  int16_t **rxsigF;
   /// \brief local buffer to compute prach_ifft (necessary in case of multiple CCs)
   /// first index: rx antenna [0..63] (hard coded) \note Hard coded array size indexed by \c nb_antennas_rx.
   /// second index: ? [0..2047] (hard coded)
-  int16_t *prach_ifft[64];
-  /// NFAPI PRACH information
-  nfapi_preamble_pdu_t preamble_list[MAX_NUM_RX_PRACH_PREAMBLES];
+  int32_t ***prach_ifft;
+
+  /// repetition number
+#ifdef Rel14
+  /// indicator of first frame in a group of PRACH repetitions
+  int first_frame[4];
+  /// current repetition for each CE level
+  int repetition_number[4];
+#endif
 } LTE_eNB_PRACH;
 
 typedef struct {
@@ -1162,6 +1214,7 @@ typedef struct {
   uint8_t *Msg3;
 } PRACH_RESOURCES_t;
 
+
 typedef struct {
   /// Downlink Power offset field
   uint8_t dl_pow_off;
diff --git a/openair1/SCHED/defs.h b/openair1/SCHED/defs.h
index 26859b6528..f414e28f63 100644
--- a/openair1/SCHED/defs.h
+++ b/openair1/SCHED/defs.h
@@ -199,10 +199,13 @@ void phy_procedures_eNB_S_RX(PHY_VARS_eNB *phy_vars_eNB,eNB_rxtx_proc_t *proc,re
 
 /*! \brief Scheduling for eNB PRACH RX procedures
   @param phy_vars_eNB Pointer to eNB variables on which to act
-  @param proc Pointer to RXn-TXnp4 proc information
+  @param br_flag indicator for eMTC PRACH
 */
-void prach_procedures(PHY_VARS_eNB *eNB);
-
+void prach_procedures(PHY_VARS_eNB *eNB,
+#ifdef Rel14
+		      int br_flag
+#endif
+		      );
 /*! \brief Function to compute subframe type as a function of Frame type and TDD Configuration (implements Table 4.2.2 from 36.211, p.11 from version 8.6) and subframe index.
   @param frame_parms Pointer to DL frame parameter descriptor
   @param subframe Subframe index
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index f9a89c59b0..546e6b7abf 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -715,7 +715,7 @@ void pdsch_procedures(PHY_VARS_eNB *eNB,
   LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
   int i;
 
-  LOG_I(PHY,
+  LOG_D(PHY,
 	"[eNB %"PRIu8"][PDSCH %"PRIx16"/%"PRIu8"] Frame %d, subframe %d: Generating PDSCH/DLSCH with input size = %"PRIu16", G %d, nb_rb %"PRIu16", mcs %"PRIu8", pmi_alloc %"PRIx64", rv %"PRIu8" (round %"PRIu8")\n",
 	eNB->Mod_id, dlsch->rnti,harq_pid,
 	frame, subframe, input_buffer_length,
@@ -903,7 +903,7 @@ void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB,
   LTE_eNB_PDCCH *pdcch_vars       = &eNB->pdcch_vars[idx];
   nfapi_dl_config_dci_dl_pdu *pdu = &dl_config_pdu->dci_dl_pdu;
 
-  LOG_I(PHY,"Frame %d, Subframe %d: DCI processing\n",proc->frame_tx,proc->subframe_tx);
+  LOG_D(PHY,"Frame %d, Subframe %d: DCI processing\n",proc->frame_tx,proc->subframe_tx);
 
   // copy dci configuration into eNB structure
   fill_dci_and_dlsch(eNB,proc,&pdcch_vars->dci_alloc[pdcch_vars->num_dci],pdu);
@@ -918,7 +918,7 @@ void handle_nfapi_mpdcch_pdu(PHY_VARS_eNB *eNB,
   LTE_eNB_MPDCCH *mpdcch_vars     = &eNB->mpdcch_vars[idx];
   nfapi_dl_config_mpdcch_pdu *pdu = &dl_config_pdu->mpdcch_pdu;
 
-  LOG_I(PHY,"Frame %d, Subframe %d: MDCI processing\n",proc->frame_tx,proc->subframe_tx);
+  LOG_D(PHY,"Frame %d, Subframe %d: MDCI processing\n",proc->frame_tx,proc->subframe_tx);
 
   // copy dci configuration into eNB structure
   fill_mdci_and_dlsch(eNB,proc,&mpdcch_vars->mdci_alloc[mpdcch_vars->num_dci],pdu);
@@ -946,7 +946,7 @@ void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
   
   nfapi_hi_dci0_hi_pdu *pdu      = &hi_dci0_config_pdu->hi_pdu;
   // copy dci configuration in to eNB structure
-  LOG_I(PHY,"Received HI PDU which value %d (rbstart %d,cshift %d)\n",
+  LOG_D(PHY,"Received HI PDU which value %d (rbstart %d,cshift %d)\n",
 	hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.hi_value,
 	hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.resource_block_start,
 	hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms);
@@ -960,7 +960,7 @@ handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
   
   AssertFatal(rel8->length == 3, "BCH PDU has length %d != 3\n",rel8->length);
 
-  LOG_I(PHY,"bch_pdu: %x,%x,%x\n",sdu[0],sdu[1],sdu[2]);
+  LOG_D(PHY,"bch_pdu: %x,%x,%x\n",sdu[0],sdu[1],sdu[2]);
   eNB->pbch_pdu[0] = sdu[2];
   eNB->pbch_pdu[1] = sdu[1];
   eNB->pbch_pdu[2] = sdu[0];
@@ -1012,7 +1012,7 @@ handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
   dlsch1_harq     = dlsch1->harq_processes[harq_pid];
   AssertFatal(dlsch0_harq!=NULL,"dlsch_harq is null\n");
 
-  LOG_I(PHY,"NFAPI: frame %d, subframe %d: programming dlsch, rnti %x, UE_id %d, harq_pid %d\n",
+  LOG_D(PHY,"NFAPI: frame %d, subframe %d: programming dlsch, rnti %x, UE_id %d, harq_pid %d\n",
 	proc->frame_tx,proc->subframe_tx,rel8->rnti,UE_id,harq_pid);
   if (codeword_index == 0) dlsch0_harq->pdu                    = sdu;
   else                     dlsch1_harq->pdu                    = sdu;
@@ -1129,7 +1129,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
   eNB->pdcch_vars[subframe&1].num_dci           = 0;
 
 
-  LOG_I(PHY,"NFAPI: received %d dl_pdu, %d tx_req, %d hi_dci0_config_req, %d UL_config \n",
+  LOG_D(PHY,"NFAPI: received %d dl_pdu, %d tx_req, %d hi_dci0_config_req, %d UL_config \n",
 	number_dl_pdu,TX_req->tx_request_body.number_of_pdus,number_hi_dci0_pdu,number_ul_pdu);
 
   
@@ -1149,7 +1149,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
   }
   for (i=0;i<number_dl_pdu;i++) {
     dl_config_pdu = &DL_req->dl_config_request_body.dl_config_pdu_list[i];
-    LOG_I(PHY,"NFAPI: dl_pdu %d : type %d\n",i,dl_config_pdu->pdu_type);
+    LOG_D(PHY,"NFAPI: dl_pdu %d : type %d\n",i,dl_config_pdu->pdu_type);
     switch (dl_config_pdu->pdu_type) {
     case NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE:
       handle_nfapi_dci_dl_pdu(eNB,proc,dl_config_pdu);
@@ -1179,7 +1179,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
       handle_nfapi_dlsch_pdu(eNB,proc,dl_config_pdu,
 			     dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks-1,
 			     TX_req->tx_request_body.tx_pdu_list[dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index].segments[0].segment_data);
-      if (dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti == eNB->prach_vars.preamble_list[0].preamble_rel8.rnti) {// is RAR pdu
+      if (dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti == eNB->preamble_list[0].preamble_rel8.rnti) {// is RAR pdu
 	
 	generate_eNB_ulsch_params_from_rar(eNB,
 					   TX_req->tx_request_body.tx_pdu_list[dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index].segments[0].segment_data,
@@ -1226,7 +1226,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
 
   for (i=0;i<number_ul_pdu;i++) {
     ul_config_pdu = &UL_req->ul_config_request_body.ul_config_pdu_list[i];
-    LOG_I(PHY,"NFAPI: ul_pdu %d : type %d\n",i,ul_config_pdu->pdu_type);
+    LOG_D(PHY,"NFAPI: ul_pdu %d : type %d\n",i,ul_config_pdu->pdu_type);
     AssertFatal(ul_config_pdu->pdu_type == NFAPI_UL_CONFIG_ULSCH_PDU_TYPE,
 		"Optional UL_PDU type %d not supported\n",ul_config_pdu->pdu_type);
     handle_nfapi_ul_pdu(eNB,proc,ul_config_pdu);
@@ -1382,7 +1382,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
   num_dci           = eNB->pdcch_vars[subframe&1].num_dci;
   //  LOG_D(PHY,"num_pdcch_symbols %"PRIu8",(dci common %"PRIu8", dci uespec %"PRIu8"\n",num_pdcch_symbols,
   //        DCI_pdu->Num_common_dci,DCI_pdu->Num_ue_spec_dci);
-  LOG_I(PHY,"num_pdcch_symbols %"PRIu8",(number dci %"PRIu8"\n",num_pdcch_symbols,
+  LOG_D(PHY,"num_pdcch_symbols %"PRIu8",(number dci %"PRIu8"\n",num_pdcch_symbols,
 	num_dci);
   VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_DCI_INFO,num_pdcch_symbols);
 
@@ -1394,7 +1394,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
   phy_config_dedicated_eNB_step2(eNB);
 
   if (num_dci > 0)
-    LOG_I(PHY,"[eNB %"PRIu8"] Frame %d, subframe %d: Calling generate_dci_top (pdcch) (num_dci %"PRIu8")\n",eNB->Mod_id,frame, subframe,
+    LOG_D(PHY,"[eNB %"PRIu8"] Frame %d, subframe %d: Calling generate_dci_top (pdcch) (num_dci %"PRIu8")\n",eNB->Mod_id,frame, subframe,
 	  num_dci);
     
   generate_dci_top(num_pdcch_symbols,
@@ -1917,107 +1917,136 @@ void get_n1_pucch_eNB(PHY_VARS_eNB *eNB,
   }
 }
 
-void prach_procedures(PHY_VARS_eNB *eNB) {
+void prach_procedures(PHY_VARS_eNB *eNB,
+#ifdef Rel14
+		      int br_flag
+#endif
+		      ) {
 
   LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
-  uint16_t preamble_energy_list[64],preamble_delay_list[64];
-  uint16_t preamble_max,preamble_energy_max;
+  uint16_t max_preamble[4],max_preamble_energy[4],max_preamble_delay[4];
   uint16_t i;
-  int subframe = eNB->proc.subframe_prach;
-  int frame = eNB->proc.frame_prach;
+  int frame,subframe;
+#ifdef Rel14
+  if (br_flag==1) {
+    subframe = eNB->proc.subframe_prach_br;
+    frame = eNB->proc.frame_prach_br;
+  }
+  else
+#endif
+    {
+      subframe = eNB->proc.subframe_prach;
+      frame = eNB->proc.frame_prach;
+    }
   uint8_t CC_id = eNB->CC_id;
   RU_t *ru;
   int aa=0;
   int ru_aa;
+  LTE_eNB_PRACH *prach_vars;
 
+ 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,1);
-  memset(&preamble_energy_list[0],0,64*sizeof(uint16_t));
-  memset(&preamble_delay_list[0],0,64*sizeof(uint16_t));
-
 
   for (i=0;i<eNB->num_RU;i++) {
     ru=eNB->RU_list[i];
-    for (ru_aa=0;ru_aa<ru->nb_rx;ru_aa++) eNB->prach_vars.rxsigF[aa++] = eNB->RU_list[i]->prach_rxsigF[ru_aa];
-  }
-  rx_prach(eNB,
-	   eNB->RU_list[0],
-	   preamble_energy_list,
-	   preamble_delay_list,
-	   frame,
-	   0);
-  preamble_energy_max = preamble_energy_list[0];
-  preamble_max = 0;
+    for (ru_aa=0,aa=0;ru_aa<ru->nb_rx;ru_aa++,aa++) {
+      eNB->prach_vars.rxsigF[aa] = eNB->RU_list[i]->prach_rxsigF[ru_aa];
+#ifdef Rel14
+      int ce_level;
 
-  for (i=1; i<64; i++) {
-    if (preamble_energy_max < preamble_energy_list[i]) {
-      preamble_energy_max = preamble_energy_list[i];
-      preamble_max = i;
+      if (br_flag==1)
+	for (ce_level=0;ce_level<4;ce_level++) eNB->prach_vars_br.rxsigF[aa] = eNB->RU_list[i]->prach_rxsigF_br[ce_level][ru_aa];
+#endif
     }
   }
 
+  rx_prach(eNB,
+	   eNB->RU_list[0],
+	   &max_preamble[0],
+	   &max_preamble_energy[0],
+	   &max_preamble_delay[0],
+	   frame,
+	   0
+#ifdef Rel14
+	   ,br_flag
+#endif
+	   );
+
   //#ifdef DEBUG_PHY_PROC
-  LOG_I(PHY,"[RAPROC] Frame %d, subframe %d : Most likely preamble %d, energy %d dB delay %d\n",
+  LOG_D(PHY,"[RAPROC] Frame %d, subframe %d : Most likely preamble %d, energy %d dB delay %d\n",
         frame,subframe,
-	preamble_max,
-        preamble_energy_list[preamble_max],
-        preamble_delay_list[preamble_max]);
+	max_preamble[0],
+        max_preamble_energy[0],
+        max_preamble_delay[0]);
   //#endif
 
-  if (preamble_energy_list[preamble_max] > 580) {
+#ifdef Rel14
+  if (br_flag==1) {
 
-    //    UE_id = find_next_ue_index(eNB);
- 
-    //    if (UE_id>=0) {
-      //      eNB->UE_stats[(uint32_t)UE_id].UE_timing_offset = preamble_delay_list[preamble_max]&0x1FFF; //limit to 13 (=11+2) bits
-
-      //      eNB->UE_stats[(uint32_t)UE_id].sector = 0;
-    LOG_I(PHY,"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d\n",
-	  eNB->Mod_id,
-	  eNB->CC_id,
-	  frame,
-	  subframe,
-	  preamble_max,
-	  preamble_energy_max/10,
-	  preamble_energy_max%10,
-	  preamble_delay_list[preamble_max]);
+    prach_vars = &eNB->prach_vars_br;
+    int prach_mask;
+      
+    prach_mask = is_prach_subframe(&eNB->frame_parms,eNB->proc.frame_prach_br,eNB->proc.subframe_prach_br);
     
-    T(T_ENB_PHY_INITIATE_RA_PROCEDURE, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe), 0,
-      T_INT(preamble_max), T_INT(preamble_energy_max), T_INT(preamble_delay_list[preamble_max]));
-
-    if (eNB->mac_enabled==1) {
-      LTE_eNB_PRACH *prach_vars = &eNB->prach_vars;
-      
-      uint8_t update_TA  = 4;
-      uint8_t update_TA2 = 1;
-      switch (fp->N_RB_DL) {
-      case 6:
-	update_TA = 16;
-	break;
-	
-      case 25:
-	update_TA = 4;
-	break;
-	
-      case 50:
-	update_TA = 2;
-	break;
-	
-      case 75:
-	update_TA  = 3;
-	update_TA2 = 2;
-      case 100:
-	update_TA  = 1;
-	break;
+    eNB->UL_INFO.rach_ind_br.preamble_list                              = eNB->preamble_list_br;
+    
+    for (int ind=0,ce_level=0;ce_level<4;ce_level++) {
+      if ((prach_mask&(1<<(1+ce_level)) > 0) && // prach is active and CE level has finished its repetitions
+	  (eNB->prach_vars_br.repetition_number[ce_level]==
+	   eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level])) {
+	if (max_preamble_energy[ind] > 580) {
+	  eNB->UL_INFO.rach_ind_br.number_of_preambles++;
+	  
+	  eNB->preamble_list_br[ind].preamble_rel8.timing_advance        = max_preamble_delay[ind];//
+	  eNB->preamble_list_br[ind].preamble_rel8.preamble              = max_preamble[ind];
+	  // note: fid is implicitly 0 here, this is the rule for eMTC RA-RNTI from 36.321, Section 5.1.4
+	  eNB->preamble_list_br[ind].preamble_rel8.rnti                  = 1+subframe+(eNB->prach_vars_br.first_frame[ce_level]%40);  
+	  eNB->preamble_list_br[ind].instance_length                     = 0; //don't know exactly what this is
+	  eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type   = 1+ce_level;  // CE Level
+	}
+	ind++;
       }
-      pthread_mutex_lock(&eNB->UL_INFO_mutex);
-      eNB->UL_INFO.rach_ind.number_of_preambles                        = 1;
-      eNB->UL_INFO.rach_ind.preamble_list                              = prach_vars->preamble_list;
-      
-      prach_vars->preamble_list[0].preamble_rel8.timing_advance        = preamble_delay_list[preamble_max]*update_TA/update_TA2;
-      prach_vars->preamble_list[0].preamble_rel8.preamble              = preamble_max;
-      prach_vars->preamble_list[0].preamble_rel8.rnti                  = 1+subframe;  // note: fid is implicitly 0 here
-      prach_vars->preamble_list[0].instance_length                     = 0; //don't know exactly what this is
-      pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+    } // ce_level
+  }
+  else
+#endif
+
+    {
+      if (max_preamble_energy[0] > 580) {
+
+	LOG_D(PHY,"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d\n",
+	      eNB->Mod_id,
+	      eNB->CC_id,
+	      frame,
+	      subframe,
+	      max_preamble[0],
+	      max_preamble_energy[0]/10,
+	      max_preamble_energy[0]%10,
+	      max_preamble_delay[0]);
+	
+	    T(T_ENB_PHY_INITIATE_RA_PROCEDURE, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe), 0,
+	      T_INT(max_preamble[0]), T_INT(max_preamble_energy[0]), T_INT(max_preamble_delay[0]));
+	    
+	    if (eNB->mac_enabled==1) {
+	      
+	      prach_vars = &eNB->prach_vars;
+	      
+	      
+	      pthread_mutex_lock(&eNB->UL_INFO_mutex);
+	      
+	      eNB->UL_INFO.rach_ind.number_of_preambles                 = 1;
+	      eNB->UL_INFO.rach_ind.preamble_list                       = eNB->preamble_list;
+	      
+	      eNB->preamble_list[0].preamble_rel8.timing_advance        = max_preamble_delay[0];
+	      eNB->preamble_list[0].preamble_rel8.preamble              = max_preamble[0];
+	      eNB->preamble_list[0].preamble_rel8.rnti                  = 1+subframe;  // note: fid is implicitly 0 here
+	      eNB->preamble_list[0].preamble_rel13.rach_resource_type   = 0;
+	      eNB->preamble_list[0].instance_length                     = 0; //don't know exactly what this is
+	    
+	      pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+	    }
+      } // max_preamble_energy > 580
+    } // else br_flag
       /*
 	mac_xface->initiate_ra_proc(eNB->Mod_id,
 	eNB->CC_id,
@@ -2026,15 +2055,13 @@ void prach_procedures(PHY_VARS_eNB *eNB) {
 	preamble_delay_list[preamble_max]*update_TA/update_TA2,
 	0,subframe,0);*/
       
-      // fill eNB->UL_info with prach information
-    }      
     
     /*  } else {
     MSC_LOG_EVENT(MSC_PHY_ENB, "0 RA Failed add user, too many");
     LOG_I(PHY,"[eNB %d][RAPROC] frame %d, subframe %d: Unable to add user, max user count reached\n",
 	  eNB->Mod_id,frame, subframe);
 	  }*/
-  }
+
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,0);
 }
 
@@ -2569,7 +2596,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,const
     if ((ulsch) &&
         (eNB->ulsch[i]->rnti>0) &&
         (ulsch_harq->status = ACTIVE))
-      LOG_I(PHY,"Frame %d Subframe UE %d/%x active: scheduled for (%d,%d)\n",
+      LOG_D(PHY,"Frame %d Subframe UE %d/%x active: scheduled for (%d,%d)\n",
 	    frame,i,eNB->ulsch[i]->rnti,ulsch_harq->frame,ulsch_harq->subframe);
     if ((ulsch) &&
         (eNB->ulsch[i]->rnti>0) &&
@@ -2620,7 +2647,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,const
         }
       }
 
-      LOG_I(PHY,
+      LOG_D(PHY,
             "[eNB %d][PUSCH %d] Frame %d Subframe %d Demodulating PUSCH: dci_alloc %d, rar_alloc %d, round %d, first_rb %d, nb_rb %d, mcs %d, TBS %d, rv %d, cyclic_shift %d (n_DMRS2 %d, cyclicShift_common %d, nprs %d), O_ACK %d \n",
             eNB->Mod_id,harq_pid,frame,subframe,
             ulsch_harq->dci_alloc,
@@ -2660,7 +2687,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,const
 
       stop_meas(&eNB->ulsch_decoding_stats);
 
-      LOG_I(PHY,"[eNB %d][PUSCH %d] frame %d subframe %d RNTI %x RX power (%d,%d) RSSI (%d,%d) N0 (%d,%d) dB ACK (%d,%d), decoding iter %d\n",
+      LOG_D(PHY,"[eNB %d][PUSCH %d] frame %d subframe %d RNTI %x RX power (%d,%d) RSSI (%d,%d) N0 (%d,%d) dB ACK (%d,%d), decoding iter %d\n",
             eNB->Mod_id,harq_pid,
             frame,subframe,
             ulsch->rnti,
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index d51ceb4d3c..976d25848f 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -547,65 +547,65 @@ void RCconfig_RU() {
 
 
       if (  !(
-          config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_IF_NAME,(const char **)&if_name)
-          )
-        ) {
-    fronthaul_flag = CONFIG_FALSE;
+	      config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_IF_NAME,(const char **)&if_name)
+	      )
+	    ) {
+	fronthaul_flag = CONFIG_FALSE;
       }
 
       if (fronthaul_flag != CONFIG_TRUE) { // no fronthaul
 
-    AssertFatal((setting_band = config_setting_get_member(setting_ru, CONFIG_STRING_RU_BAND_LIST))!=NULL,"No allowable LTE bands\n");
+	AssertFatal((setting_band = config_setting_get_member(setting_ru, CONFIG_STRING_RU_BAND_LIST))!=NULL,"No allowable LTE bands\n");
 
-    if (setting_band != NULL) num_bands    = config_setting_length(setting_band);
-    else num_bands=0;
+	if (setting_band != NULL) num_bands    = config_setting_length(setting_band);
+	else num_bands=0;
 
-    for (i=0;i<num_bands;i++) {
-      setting_band_elem = config_setting_get_elem(setting_band,i);
-      band[i] = config_setting_get_int(setting_band_elem);
-      printf("RU %d: band %d\n",j,band[i]);
-    }
+	for (i=0;i<num_bands;i++) {
+	  setting_band_elem = config_setting_get_elem(setting_band,i);
+	  band[i] = config_setting_get_int(setting_band_elem);
+	  printf("RU %d: band %d\n",j,band[i]);
+	}
       } // fronthaul_flag == CONFIG_FALSE
       else { // fronthaul_flag == CONFIG_TRUE
-    if (  !(
-        config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_ADDRESS,        (const char **)&ipv4)
-        && config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_REMOTE_ADDRESS,       (const char **)&ipv4_remote)
-        && config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_LOCAL_PORTC,          &local_portc)
-        && config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_REMOTE_PORTC,         &remote_portc)
-        && config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_LOCAL_PORTD,          &local_portd)
-        && config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_REMOTE_PORTD,         &remote_portd)
-        && config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_TRANSPORT_PREFERENCE, (const char **)&tr_preference)
-        )
-          ) {
-      AssertFatal (0,
-               "Failed to parse configuration file %s, RU %d config !\n",
-               RC.config_file_name, j);
-      continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-    }
-    AssertFatal((setting_eNB_list = config_setting_get_member(setting_ru, CONFIG_STRING_RU_ENB_LIST))!=NULL,"No RU<->eNB mappings\n");
+	if (  !(
+		config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_ADDRESS,        (const char **)&ipv4)
+		&& config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_REMOTE_ADDRESS,       (const char **)&ipv4_remote)
+		&& config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_LOCAL_PORTC,          &local_portc)
+		&& config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_REMOTE_PORTC,         &remote_portc)
+		&& config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_LOCAL_PORTD,          &local_portd)
+		&& config_setting_lookup_int   (setting_ru, CONFIG_STRING_RU_REMOTE_PORTD,         &remote_portd)
+		&& config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_TRANSPORT_PREFERENCE, (const char **)&tr_preference)
+		)
+	      ) {
+	  AssertFatal (0,
+		       "Failed to parse configuration file %s, RU %d config !\n",
+		       RC.config_file_name, j);
+	  continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+	}
+	AssertFatal((setting_eNB_list = config_setting_get_member(setting_ru, CONFIG_STRING_RU_ENB_LIST))!=NULL,"No RU<->eNB mappings\n");
 
-    if (setting_eNB_list != NULL) num_eNB4RU    = config_setting_length(setting_eNB_list);
-    else num_eNB4RU=0;
-    AssertFatal(num_eNB4RU>0,"Number of eNBs is zero\n");
+	if (setting_eNB_list != NULL) num_eNB4RU    = config_setting_length(setting_eNB_list);
+	else num_eNB4RU=0;
+	AssertFatal(num_eNB4RU>0,"Number of eNBs is zero\n");
 
-    for (i=0;i<num_eNB4RU;i++) {
-      setting_eNB_list_elem = config_setting_get_elem(setting_eNB_list,i);
-      eNB_list[i] = config_setting_get_int(setting_eNB_list_elem);
-      printf("RU %d: eNB %d\n",j,eNB_list[i]);
-    }
+	for (i=0;i<num_eNB4RU;i++) {
+	  setting_eNB_list_elem = config_setting_get_elem(setting_eNB_list,i);
+	  eNB_list[i] = config_setting_get_int(setting_eNB_list_elem);
+	  printf("RU %d: eNB %d\n",j,eNB_list[i]);
+	}
       }
 
       if ( !(
-         config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_NB_TX,  &nb_tx)
-         && config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_NB_RX,  &nb_rx)
-         && config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_ATT_TX, &att_tx)
-         && config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_ATT_RX, &att_rx)
-         && config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_RF,(const char **)&local_rf)
-         )) {
-    AssertFatal (0,
-             "Failed to parse configuration file %s, RU %d config !\n",
-             RC.config_file_name, j);
-    continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+	     config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_NB_TX,  &nb_tx)
+	     && config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_NB_RX,  &nb_rx)
+	     && config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_ATT_TX, &att_tx)
+	     && config_setting_lookup_int(setting_ru, CONFIG_STRING_RU_ATT_RX, &att_rx)
+	     && config_setting_lookup_string(setting_ru, CONFIG_STRING_RU_LOCAL_RF,(const char **)&local_rf)
+	     )) {
+	AssertFatal (0,
+		     "Failed to parse configuration file %s, RU %d config !\n",
+		     RC.config_file_name, j);
+	continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
       }
 
       RC.ru[j]                                    = (RU_t*)malloc(sizeof(RU_t));
@@ -616,72 +616,74 @@ void RCconfig_RU() {
       RC.ru[j]->if_timing                           = synch_to_ext_device;
       RC.ru[j]->num_eNB                             = num_eNB4RU;
 
+      for (i=0;i<num_eNB4RU;i++) RC.ru[j]->eNB_list[i] = RC.eNB[eNB_list[i]][0];
+      
       if (strcmp(local_rf, "yes") == 0) {
-    if (fronthaul_flag == CONFIG_FALSE) {
-      RC.ru[j]->if_south                        = LOCAL_RF;
-      RC.ru[j]->function                        = eNodeB_3GPP;
+	if (fronthaul_flag == CONFIG_FALSE) {
+	  RC.ru[j]->if_south                        = LOCAL_RF;
+	  RC.ru[j]->function                        = eNodeB_3GPP;
         }
         else {
-      if (strcmp(tr_preference, "udp") == 0) {
-        RC.ru[j]->if_south                        = LOCAL_RF;
-        RC.ru[j]->function                        = NGFI_RRU_IF5;
-        RC.ru[j]->eth_params.transp_preference    = ETH_UDP_MODE;
-      } else if (strcmp(tr_preference, "raw") == 0) {
-        RC.ru[j]->if_south                        = LOCAL_RF;
-        RC.ru[j]->function                        = NGFI_RRU_IF5;
-        RC.ru[j]->eth_params.transp_preference    = ETH_RAW_MODE;
-      } else if (strcmp(tr_preference, "udp_if4p5") == 0) {
-        RC.ru[j]->if_south                        = LOCAL_RF;
-        RC.ru[j]->function                        = NGFI_RRU_IF4p5;
-        RC.ru[j]->eth_params.transp_preference    = ETH_UDP_IF4p5_MODE;
-      } else if (strcmp(tr_preference, "raw_if4p5") == 0) {
-        RC.ru[j]->if_south                        = LOCAL_RF;
-        RC.ru[j]->function                        = NGFI_RRU_IF4p5;
-        RC.ru[j]->eth_params.transp_preference    = ETH_RAW_IF4p5_MODE;
-      }
-    }
+	  if (strcmp(tr_preference, "udp") == 0) {
+	    RC.ru[j]->if_south                        = LOCAL_RF;
+	    RC.ru[j]->function                        = NGFI_RRU_IF5;
+	    RC.ru[j]->eth_params.transp_preference    = ETH_UDP_MODE;
+	  } else if (strcmp(tr_preference, "raw") == 0) {
+	    RC.ru[j]->if_south                        = LOCAL_RF;
+	    RC.ru[j]->function                        = NGFI_RRU_IF5;
+	    RC.ru[j]->eth_params.transp_preference    = ETH_RAW_MODE;
+	  } else if (strcmp(tr_preference, "udp_if4p5") == 0) {
+	    RC.ru[j]->if_south                        = LOCAL_RF;
+	    RC.ru[j]->function                        = NGFI_RRU_IF4p5;
+	    RC.ru[j]->eth_params.transp_preference    = ETH_UDP_IF4p5_MODE;
+	  } else if (strcmp(tr_preference, "raw_if4p5") == 0) {
+	    RC.ru[j]->if_south                        = LOCAL_RF;
+	    RC.ru[j]->function                        = NGFI_RRU_IF4p5;
+	    RC.ru[j]->eth_params.transp_preference    = ETH_RAW_IF4p5_MODE;
+	  }
+	}
 
-    RC.ru[j]->max_pdschReferenceSignalPower     = max_pdschReferenceSignalPower;
-    RC.ru[j]->max_rxgain                        = max_rxgain;
-    RC.ru[j]->num_bands                         = num_bands;
-    for (i=0;i<num_bands;i++) RC.ru[j]->band[i] = band[i];
+	RC.ru[j]->max_pdschReferenceSignalPower     = max_pdschReferenceSignalPower;
+	RC.ru[j]->max_rxgain                        = max_rxgain;
+	RC.ru[j]->num_bands                         = num_bands;
+	for (i=0;i<num_bands;i++) RC.ru[j]->band[i] = band[i];
       }
       else {
-    printf("RU %d: Transport %s\n",j,tr_preference);
+	printf("RU %d: Transport %s\n",j,tr_preference);
 
-    RC.ru[j]->eth_params.local_if_name            = strdup(if_name);
-    RC.ru[j]->eth_params.my_addr                  = strdup(ipv4);
-    RC.ru[j]->eth_params.remote_addr              = strdup(ipv4_remote);
-    RC.ru[j]->eth_params.my_portc                 = local_portc;
-    RC.ru[j]->eth_params.remote_portc             = remote_portc;
-    RC.ru[j]->eth_params.my_portd                 = local_portd;
-    RC.ru[j]->eth_params.remote_portd             = remote_portd;
-    for (i=0;i<num_eNB4RU;i++) RC.ru[j]->eNB_list[i] = RC.eNB[eNB_list[i]][0];
+	RC.ru[j]->eth_params.local_if_name            = strdup(if_name);
+	RC.ru[j]->eth_params.my_addr                  = strdup(ipv4);
+	RC.ru[j]->eth_params.remote_addr              = strdup(ipv4_remote);
+	RC.ru[j]->eth_params.my_portc                 = local_portc;
+	RC.ru[j]->eth_params.remote_portc             = remote_portc;
+	RC.ru[j]->eth_params.my_portd                 = local_portd;
+	RC.ru[j]->eth_params.remote_portd             = remote_portd;
+	for (i=0;i<num_eNB4RU;i++) RC.ru[j]->eNB_list[i] = RC.eNB[eNB_list[i]][0];
 
-    if (strcmp(tr_preference, "udp") == 0) {
-      RC.ru[j]->if_south                     = REMOTE_IF5;
-      RC.ru[j]->function                     = NGFI_RAU_IF5;
-      RC.ru[j]->eth_params.transp_preference = ETH_UDP_MODE;
-    } else if (strcmp(tr_preference, "raw") == 0) {
-      RC.ru[j]->if_south                     = REMOTE_IF5;
-      RC.ru[j]->function                     = NGFI_RAU_IF5;
-      RC.ru[j]->eth_params.transp_preference = ETH_RAW_MODE;
-    } else if (strcmp(tr_preference, "udp_if4p5") == 0) {
-      RC.ru[j]->if_south                     = REMOTE_IF4p5;
-      RC.ru[j]->function                     = NGFI_RAU_IF4p5;
-      RC.ru[j]->eth_params.transp_preference = ETH_UDP_IF4p5_MODE;
-    } else if (strcmp(tr_preference, "raw_if4p5") == 0) {
-      RC.ru[j]->if_south                     = REMOTE_IF4p5;
-      RC.ru[j]->function                     = NGFI_RAU_IF4p5;
-      RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF4p5_MODE;
-    } else if (strcmp(tr_preference, "raw_if5_mobipass") == 0) {
-      RC.ru[j]->if_south                     = REMOTE_IF5;
-      RC.ru[j]->function                     = NGFI_RAU_IF5;
-      RC.ru[j]->if_timing                    = synch_to_other;
-      RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF5_MOBIPASS;
-    }
-    RC.ru[j]->att_tx                         = att_tx;
-    RC.ru[j]->att_rx                         = att_rx;
+	if (strcmp(tr_preference, "udp") == 0) {
+	  RC.ru[j]->if_south                     = REMOTE_IF5;
+	  RC.ru[j]->function                     = NGFI_RAU_IF5;
+	  RC.ru[j]->eth_params.transp_preference = ETH_UDP_MODE;
+	} else if (strcmp(tr_preference, "raw") == 0) {
+	  RC.ru[j]->if_south                     = REMOTE_IF5;
+	  RC.ru[j]->function                     = NGFI_RAU_IF5;
+	  RC.ru[j]->eth_params.transp_preference = ETH_RAW_MODE;
+	} else if (strcmp(tr_preference, "udp_if4p5") == 0) {
+	  RC.ru[j]->if_south                     = REMOTE_IF4p5;
+	  RC.ru[j]->function                     = NGFI_RAU_IF4p5;
+	  RC.ru[j]->eth_params.transp_preference = ETH_UDP_IF4p5_MODE;
+	} else if (strcmp(tr_preference, "raw_if4p5") == 0) {
+	  RC.ru[j]->if_south                     = REMOTE_IF4p5;
+	  RC.ru[j]->function                     = NGFI_RAU_IF4p5;
+	  RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF4p5_MODE;
+	} else if (strcmp(tr_preference, "raw_if5_mobipass") == 0) {
+	  RC.ru[j]->if_south                     = REMOTE_IF5;
+	  RC.ru[j]->function                     = NGFI_RAU_IF5;
+	  RC.ru[j]->if_timing                    = synch_to_other;
+	  RC.ru[j]->eth_params.transp_preference = ETH_RAW_IF5_MOBIPASS;
+	}
+	RC.ru[j]->att_tx                         = att_tx;
+	RC.ru[j]->att_rx                         = att_rx;
       }
 
       RC.ru[j]->nb_tx                             = nb_tx;
@@ -731,25 +733,25 @@ void RCconfig_L1() {
 
       setting_l1 = config_setting_get_elem(setting, j);
       if (!config_setting_lookup_int   (setting_l1,CONFIG_STRING_L1_CC,&RC.nb_L1_CC[j]))
-    AssertFatal (0,
-             "Failed to parse configuration file %s, L1 %d config !\n",
-             RC.config_file_name, j);
+	AssertFatal (0,
+		     "Failed to parse configuration file %s, L1 %d config !\n",
+		     RC.config_file_name, j);
 
       if (RC.eNB[j] == NULL) {
-    RC.eNB[j]                       = (PHY_VARS_eNB **)malloc((1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB**));
-    LOG_I(PHY,"RC.eNB[%d] = %p\n",j,RC.eNB[j]);
-    memset(RC.eNB[j],0,(1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB***));
+	RC.eNB[j]                       = (PHY_VARS_eNB **)malloc((1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB**));
+	LOG_I(PHY,"RC.eNB[%d] = %p\n",j,RC.eNB[j]);
+	memset(RC.eNB[j],0,(1+MAX_NUM_CCs)*sizeof(PHY_VARS_eNB***));
       }
 
 
       for (i=0;i<RC.nb_L1_CC[j];i++) {
-    if (RC.eNB[j][i] == NULL) {
-      RC.eNB[j][i] = (PHY_VARS_eNB *)malloc(sizeof(PHY_VARS_eNB));
-      memset((void*)RC.eNB[j][i],0,sizeof(PHY_VARS_eNB));
-      LOG_I(PHY,"RC.eNB[%d][%d] = %p\n",j,i,RC.eNB[j][i]);
-      RC.eNB[j][i]->Mod_id  = j;
-      RC.eNB[j][i]->CC_id   = i;
-    }
+	if (RC.eNB[j][i] == NULL) {
+	  RC.eNB[j][i] = (PHY_VARS_eNB *)malloc(sizeof(PHY_VARS_eNB));
+	  memset((void*)RC.eNB[j][i],0,sizeof(PHY_VARS_eNB));
+	  LOG_I(PHY,"RC.eNB[%d][%d] = %p\n",j,i,RC.eNB[j][i]);
+	  RC.eNB[j][i]->Mod_id  = j;
+	  RC.eNB[j][i]->CC_id   = i;
+	}
       }
 
 
@@ -759,38 +761,38 @@ void RCconfig_L1() {
 
       printf("RU %d: Transport %s\n",j,tr_n_preference);
       if (!(config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE, (const char **)&tr_n_preference))) {
-    AssertFatal (0,
-             "Failed to parse configuration file %s, L1 %d config !\n",
-             RC.config_file_name, j);
+	AssertFatal (0,
+		     "Failed to parse configuration file %s, L1 %d config !\n",
+		     RC.config_file_name, j);
       }
 
       if (strcmp(tr_n_preference, "local_mac") == 0) {
 
       }
       else if (strcmp(tr_n_preference, "nfapi") == 0) {
-    if (  !(
-        config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_LOCAL_N_IF_NAME,        (const char **)&if_name_n)
-        && config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_LOCAL_N_ADDRESS,        (const char **)&ipv4_n)
-        && config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_REMOTE_N_ADDRESS,       (const char **)&ipv4_n_remote)
-        && config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_LOCAL_N_PORTC,          &local_n_portc)
-        && config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_REMOTE_N_PORTC,         &remote_n_portc)
-        && config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_LOCAL_N_PORTD,          &local_n_portd)
-        && config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_REMOTE_N_PORTD,         &remote_n_portd)
-        )
-          ) {
-      AssertFatal (0,
-               "Failed to parse configuration file %s, L1 %d config !\n",
-               RC.config_file_name, j);
-      continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-    }
-    RC.eNB[j][0]->eth_params_n.local_if_name            = strdup(if_name_n);
-    RC.eNB[j][0]->eth_params_n.my_addr                  = strdup(ipv4_n);
-    RC.eNB[j][0]->eth_params_n.remote_addr              = strdup(ipv4_n_remote);
-    RC.eNB[j][0]->eth_params_n.my_portc                 = local_n_portc;
-    RC.eNB[j][0]->eth_params_n.remote_portc             = remote_n_portc;
-    RC.eNB[j][0]->eth_params_n.my_portd                 = local_n_portd;
-    RC.eNB[j][0]->eth_params_n.remote_portd             = remote_n_portd;
-    RC.eNB[j][0]->eth_params_n.transp_preference          = ETH_UDP_MODE;
+	if (  !(
+		config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_LOCAL_N_IF_NAME,        (const char **)&if_name_n)
+		&& config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_LOCAL_N_ADDRESS,        (const char **)&ipv4_n)
+		&& config_setting_lookup_string(setting_l1, CONFIG_STRING_L1_REMOTE_N_ADDRESS,       (const char **)&ipv4_n_remote)
+		&& config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_LOCAL_N_PORTC,          &local_n_portc)
+		&& config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_REMOTE_N_PORTC,         &remote_n_portc)
+		&& config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_LOCAL_N_PORTD,          &local_n_portd)
+		&& config_setting_lookup_int   (setting_l1, CONFIG_STRING_L1_REMOTE_N_PORTD,         &remote_n_portd)
+		)
+	      ) {
+	  AssertFatal (0,
+		       "Failed to parse configuration file %s, L1 %d config !\n",
+		       RC.config_file_name, j);
+	  continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+	}
+	RC.eNB[j][0]->eth_params_n.local_if_name            = strdup(if_name_n);
+	RC.eNB[j][0]->eth_params_n.my_addr                  = strdup(ipv4_n);
+	RC.eNB[j][0]->eth_params_n.remote_addr              = strdup(ipv4_n_remote);
+	RC.eNB[j][0]->eth_params_n.my_portc                 = local_n_portc;
+	RC.eNB[j][0]->eth_params_n.remote_portc             = remote_n_portc;
+	RC.eNB[j][0]->eth_params_n.my_portd                 = local_n_portd;
+	RC.eNB[j][0]->eth_params_n.remote_portd             = remote_n_portd;
+	RC.eNB[j][0]->eth_params_n.transp_preference          = ETH_UDP_MODE;
       }
 
       else { // other midhaul
@@ -844,52 +846,52 @@ void RCconfig_macrlc() {
       printf("macrlc %d/%d \n",j,RC.nb_macrlc_inst);
 
       if (!(config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE, (const char **)&tr_n_preference))) {
-    AssertFatal (0,
-             "Failed to parse configuration file %s, L1 %d config !\n",
-             RC.config_file_name, j);
+	AssertFatal (0,
+		     "Failed to parse configuration file %s, L1 %d config !\n",
+		     RC.config_file_name, j);
       }
 
       printf("MACRLC %d: Northbound Transport %s\n",j,tr_n_preference);
 
       if (strcmp(tr_n_preference, "local_RRC") == 0) {
-    // check number of instances is same as RRC/PDCP
+	// check number of instances is same as RRC/PDCP
 
       }
       else if (strcmp(tr_n_preference, "cudu") == 0) {
-    if (  !(
-        config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME,        (const char **)&if_name_n)
-        && config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS,        (const char **)&ipv4_n)
-        && config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS,       (const char **)&ipv4_n_remote)
-        && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_PORTC,          &local_n_portc)
-        && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_PORTC,         &remote_n_portc)
-        && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_PORTD,          &local_n_portd)
-        && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_PORTD,         &remote_n_portd)
-        )
-          ) {
-      AssertFatal (0,
-               "Failed to parse configuration file %s, L1 %d config !\n",
-               RC.config_file_name, j);
-      continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-    }
-    RC.mac[j]->eth_params_n.local_if_name            = strdup(if_name_n);
-    RC.mac[j]->eth_params_n.my_addr                  = strdup(ipv4_n);
-    RC.mac[j]->eth_params_n.remote_addr              = strdup(ipv4_n_remote);
-    RC.mac[j]->eth_params_n.my_portc                 = local_n_portc;
-    RC.mac[j]->eth_params_n.remote_portc             = remote_n_portc;
-    RC.mac[j]->eth_params_n.my_portd                 = local_n_portd;
-    RC.mac[j]->eth_params_n.remote_portd             = remote_n_portd;
-    RC.mac[j]->eth_params_n.transp_preference        = ETH_UDP_MODE;
+	if (  !(
+		config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME,        (const char **)&if_name_n)
+		&& config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS,        (const char **)&ipv4_n)
+		&& config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS,       (const char **)&ipv4_n_remote)
+		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_PORTC,          &local_n_portc)
+		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_PORTC,         &remote_n_portc)
+		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_N_PORTD,          &local_n_portd)
+		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_N_PORTD,         &remote_n_portd)
+		)
+	      ) {
+	  AssertFatal (0,
+		       "Failed to parse configuration file %s, L1 %d config !\n",
+		       RC.config_file_name, j);
+	  continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+	}
+	RC.mac[j]->eth_params_n.local_if_name            = strdup(if_name_n);
+	RC.mac[j]->eth_params_n.my_addr                  = strdup(ipv4_n);
+	RC.mac[j]->eth_params_n.remote_addr              = strdup(ipv4_n_remote);
+	RC.mac[j]->eth_params_n.my_portc                 = local_n_portc;
+	RC.mac[j]->eth_params_n.remote_portc             = remote_n_portc;
+	RC.mac[j]->eth_params_n.my_portd                 = local_n_portd;
+	RC.mac[j]->eth_params_n.remote_portd             = remote_n_portd;
+	RC.mac[j]->eth_params_n.transp_preference        = ETH_UDP_MODE;
       }
 
       else { // other midhaul
-    AssertFatal(1==0,"MACRLC %d: unknown northbound midhaul\n",j);
+	AssertFatal(1==0,"MACRLC %d: unknown northbound midhaul\n",j);
       }
 
       if (!(config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE, (const char **)&tr_s_preference))) {
-    AssertFatal (0,
-             "Failed to parse configuration file %s, L1 %d config !\n",
-             RC.config_file_name, j);
-    continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+	AssertFatal (0,
+		     "Failed to parse configuration file %s, L1 %d config !\n",
+		     RC.config_file_name, j);
+	continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
       }
 
       printf("MACRLC %d: Southbound Transport %s\n",j,tr_s_preference);
@@ -899,33 +901,33 @@ void RCconfig_macrlc() {
 
       }
       else if (strcmp(tr_s_preference, "nfapi") == 0) {
-    if (  !(
-        config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME,        (const char **)&if_name_s)
-        && config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS,        (const char **)&ipv4_s)
-        && config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS,       (const char **)&ipv4_s_remote)
-        && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_PORTC,          &local_s_portc)
-        && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_PORTC,         &remote_s_portc)
-        && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_PORTD,          &local_s_portd)
-        && config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_PORTD,         &remote_s_portd)
-         )){
-      AssertFatal (0,
-               "Failed to parse configuration file %s, L1 %d config !\n",
-               RC.config_file_name, j);
-      continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-    }
+	if (  !(
+		config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME,        (const char **)&if_name_s)
+		&& config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS,        (const char **)&ipv4_s)
+		&& config_setting_lookup_string(setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS,       (const char **)&ipv4_s_remote)
+		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_PORTC,          &local_s_portc)
+		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_PORTC,         &remote_s_portc)
+		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_LOCAL_S_PORTD,          &local_s_portd)
+		&& config_setting_lookup_int   (setting_macrlc, CONFIG_STRING_MACRLC_REMOTE_S_PORTD,         &remote_s_portd)
+		)){
+	  AssertFatal (0,
+		       "Failed to parse configuration file %s, L1 %d config !\n",
+		       RC.config_file_name, j);
+	  continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+	}
 
-    RC.mac[j]->eth_params_s.local_if_name            = strdup(if_name_s);
-    RC.mac[j]->eth_params_s.my_addr                  = strdup(ipv4_s);
-    RC.mac[j]->eth_params_s.remote_addr              = strdup(ipv4_s_remote);
-    RC.mac[j]->eth_params_s.my_portc                 = local_s_portc;
-    RC.mac[j]->eth_params_s.remote_portc             = remote_s_portc;
-    RC.mac[j]->eth_params_s.my_portd                 = local_s_portd;
-    RC.mac[j]->eth_params_s.remote_portd             = remote_s_portd;
-    RC.mac[j]->eth_params_s.transp_preference        = ETH_UDP_MODE;
+	RC.mac[j]->eth_params_s.local_if_name            = strdup(if_name_s);
+	RC.mac[j]->eth_params_s.my_addr                  = strdup(ipv4_s);
+	RC.mac[j]->eth_params_s.remote_addr              = strdup(ipv4_s_remote);
+	RC.mac[j]->eth_params_s.my_portc                 = local_s_portc;
+	RC.mac[j]->eth_params_s.remote_portc             = remote_s_portc;
+	RC.mac[j]->eth_params_s.my_portd                 = local_s_portd;
+	RC.mac[j]->eth_params_s.remote_portd             = remote_s_portd;
+	RC.mac[j]->eth_params_s.transp_preference        = ETH_UDP_MODE;
       }
 
       else { // other midhaul
-    AssertFatal(1==0,"MACRLC %d: unknown southbound midhaul\n",j);
+	AssertFatal(1==0,"MACRLC %d: unknown southbound midhaul\n",j);
       }
     }// j=0..num_inst
   }
@@ -1186,8 +1188,8 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
     setting_enb   = config_setting_get_elem(setting, i);
     active_enb[i] = config_setting_get_string (setting_enb);
     AssertFatal (active_enb[i] != NULL,
-         "Failed to parse config file %s, %uth attribute %s \n",
-         RC.config_file_name, i, ENB_CONFIG_STRING_ACTIVE_ENBS);
+		 "Failed to parse config file %s, %uth attribute %s \n",
+		 RC.config_file_name, i, ENB_CONFIG_STRING_ACTIVE_ENBS);
     active_enb[i] = strdup(active_enb[i]);
   }
 
@@ -1203,28 +1205,28 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
       setting_enb = config_setting_get_elem(setting, i);
 
       if (! config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_ENB_ID, &enb_id)) {
-    // Calculate a default eNB ID
+	// Calculate a default eNB ID
 # if defined(ENABLE_USE_MME)
-    uint32_t hash;
+	uint32_t hash;
 
-    hash = s1ap_generate_eNB_id ();
-    enb_id = i + (hash & 0xFFFF8);
+	hash = s1ap_generate_eNB_id ();
+	enb_id = i + (hash & 0xFFFF8);
 # else
-    enb_id = i;
+	enb_id = i;
 # endif
       }
 
       if (  !(       config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_CELL_TYPE,           &cell_type)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_ENB_NAME,            &enb_name)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRACKING_AREA_CODE,  &tac)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE, &mcc)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_NETWORK_CODE, &mnc)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRANSPORT_S_PREFERENCE, (const char **)&tr_s_preference)
-             )
-        ) {
-    AssertFatal (0,
-             "Failed to parse eNB configuration file %s, %u th enb\n",
-             RC.config_file_name, i);
+		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_ENB_NAME,            &enb_name)
+		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRACKING_AREA_CODE,  &tac)
+		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE, &mcc)
+		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_NETWORK_CODE, &mnc)
+		     && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRANSPORT_S_PREFERENCE, (const char **)&tr_s_preference)
+		     )
+	    ) {
+	AssertFatal (0,
+		     "Failed to parse eNB configuration file %s, %u th enb\n",
+		     RC.config_file_name, i);
       }
 
       printf("RRC %d: Southbound Transport %s\n",j,tr_s_preference);
@@ -1234,27 +1236,27 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
 
       }
       else if (strcmp(tr_s_preference, "cudu") == 0) {
-    if (  !(config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_LOCAL_S_IF_NAME,        (const char **)&if_name_s)
-        && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_LOCAL_S_ADDRESS,        (const char **)&ipv4_s)
-        && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_REMOTE_S_ADDRESS,       (const char **)&ipv4_s_remote)
-        && config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_LOCAL_S_PORTC,          &local_s_portc)
-        && config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_REMOTE_S_PORTC,         &remote_s_portc)
-        && config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_LOCAL_S_PORTD,          &local_s_portd)
-        && config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_REMOTE_S_PORTD,         &remote_s_portd)
-        )
-          ) {
-      AssertFatal (0,
-               "Failed to parse eNB configuration file %s, %u th enb\n",
-               RC.config_file_name, i);
-    }
-    rrc->eth_params_s.local_if_name            = strdup(if_name_s);
-    rrc->eth_params_s.my_addr                  = strdup(ipv4_s);
-    rrc->eth_params_s.remote_addr              = strdup(ipv4_s_remote);
-    rrc->eth_params_s.my_portc                 = local_s_portc;
-    rrc->eth_params_s.remote_portc             = remote_s_portc;
-    rrc->eth_params_s.my_portd                 = local_s_portd;
-    rrc->eth_params_s.remote_portd             = remote_s_portd;
-    rrc->eth_params_s.transp_preference        = ETH_UDP_MODE;
+	if (  !(config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_LOCAL_S_IF_NAME,        (const char **)&if_name_s)
+		&& config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_LOCAL_S_ADDRESS,        (const char **)&ipv4_s)
+		&& config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_REMOTE_S_ADDRESS,       (const char **)&ipv4_s_remote)
+		&& config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_LOCAL_S_PORTC,          &local_s_portc)
+		&& config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_REMOTE_S_PORTC,         &remote_s_portc)
+		&& config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_LOCAL_S_PORTD,          &local_s_portd)
+		&& config_setting_lookup_int   (setting_enb, ENB_CONFIG_STRING_REMOTE_S_PORTD,         &remote_s_portd)
+		)
+	      ) {
+	  AssertFatal (0,
+		       "Failed to parse eNB configuration file %s, %u th enb\n",
+		       RC.config_file_name, i);
+	}
+	rrc->eth_params_s.local_if_name            = strdup(if_name_s);
+	rrc->eth_params_s.my_addr                  = strdup(ipv4_s);
+	rrc->eth_params_s.remote_addr              = strdup(ipv4_s_remote);
+	rrc->eth_params_s.my_portc                 = local_s_portc;
+	rrc->eth_params_s.remote_portc             = remote_s_portc;
+	rrc->eth_params_s.my_portd                 = local_s_portd;
+	rrc->eth_params_s.remote_portd             = remote_s_portd;
+	rrc->eth_params_s.transp_preference        = ETH_UDP_MODE;
       }
 
       else { // other midhaul
@@ -1263,3792 +1265,3792 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
       // search if in active list
 
       for (j=0; j < num_enbs; j++) {
-    if (strcmp(active_enb[j], enb_name) == 0) {
+	if (strcmp(active_enb[j], enb_name) == 0) {
 
-      RRC_CONFIGURATION_REQ (msg_p).cell_identity = enb_id;
+	  RRC_CONFIGURATION_REQ (msg_p).cell_identity = enb_id;
 
-      /*
-        if (strcmp(cell_type, "CELL_MACRO_ENB") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cell_type = CELL_MACRO_ENB;
-        } else  if (strcmp(cell_type, "CELL_HOME_ENB") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cell_type = CELL_HOME_ENB;
-        } else {
-        AssertFatal (0,
-        "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n",
-        lib_config_file_name_pP, i, cell_type);
-        }
+	  /*
+	    if (strcmp(cell_type, "CELL_MACRO_ENB") == 0) {
+	    enb_properties_loc.properties[enb_properties_loc_index]->cell_type = CELL_MACRO_ENB;
+	    } else  if (strcmp(cell_type, "CELL_HOME_ENB") == 0) {
+	    enb_properties_loc.properties[enb_properties_loc_index]->cell_type = CELL_HOME_ENB;
+	    } else {
+	    AssertFatal (0,
+	    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n",
+	    lib_config_file_name_pP, i, cell_type);
+	    }
 
-        enb_properties_loc.properties[enb_properties_loc_index]->eNB_name         = strdup(enb_name);
-      */
-      RRC_CONFIGURATION_REQ (msg_p).tac              = (uint16_t)atoi(tac);
-      RRC_CONFIGURATION_REQ (msg_p).mcc              = (uint16_t)atoi(mcc);
-      RRC_CONFIGURATION_REQ (msg_p).mnc              = (uint16_t)atoi(mnc);
-      RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length = strlen(mnc);
-      AssertFatal((RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length == 2) ||
-              (RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length == 3),
-              "BAD MNC DIGIT LENGTH %d",
-              RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length);
+	    enb_properties_loc.properties[enb_properties_loc_index]->eNB_name         = strdup(enb_name);
+	  */
+	  RRC_CONFIGURATION_REQ (msg_p).tac              = (uint16_t)atoi(tac);
+	  RRC_CONFIGURATION_REQ (msg_p).mcc              = (uint16_t)atoi(mcc);
+	  RRC_CONFIGURATION_REQ (msg_p).mnc              = (uint16_t)atoi(mnc);
+	  RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length = strlen(mnc);
+	  AssertFatal((RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length == 2) ||
+		      (RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length == 3),
+		      "BAD MNC DIGIT LENGTH %d",
+		      RRC_CONFIGURATION_REQ (msg_p).mnc_digit_length);
 
-      LOG_I(RRC,"RRC config (%s,%s,%s)\n",mcc,mnc,tac);
-      // Parse optional physical parameters
+	  LOG_I(RRC,"RRC config (%s,%s,%s)\n",mcc,mnc,tac);
+	  // Parse optional physical parameters
 
 
-      setting_component_carriers = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_COMPONENT_CARRIERS);
-      nb_cc = 0;
+	  setting_component_carriers = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_COMPONENT_CARRIERS);
+	  nb_cc = 0;
 
-      if (setting_component_carriers != NULL) {
+	  if (setting_component_carriers != NULL) {
 
-        num_component_carriers     = config_setting_length(setting_component_carriers);
-        LOG_I(RRC,"num component carriers %d \n", num_component_carriers);
+	    num_component_carriers     = config_setting_length(setting_component_carriers);
+	    LOG_I(RRC,"num component carriers %d \n", num_component_carriers);
 
-        //enb_properties_loc.properties[enb_properties_loc_index]->nb_cc = num_component_carriers;
-        for (j = 0; j < num_component_carriers ;j++) { // && j < MAX_NUM_CCs; j++) {
-          component_carrier = config_setting_get_elem(setting_component_carriers, j);
+	    //enb_properties_loc.properties[enb_properties_loc_index]->nb_cc = num_component_carriers;
+	    for (j = 0; j < num_component_carriers ;j++) { // && j < MAX_NUM_CCs; j++) {
+	      component_carrier = config_setting_get_elem(setting_component_carriers, j);
 
-          //printf("Component carrier %d\n",component_carrier);
-          if (!(config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_TDD_CONFIG, &tdd_config)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_TDD_CONFIG_S, &tdd_config_s)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PREFIX_TYPE, &prefix_type)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PBCH_REPETITION, &pbch_repetition)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_EUTRA_BAND, &eutra_band)
-            && config_setting_lookup_int64(component_carrier, ENB_CONFIG_STRING_DOWNLINK_FREQUENCY, &downlink_frequency)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UPLINK_FREQUENCY_OFFSET, &uplink_frequency_offset)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_NID_CELL, &Nid_cell)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_N_RB_DL, &N_RB_DL)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_CELL_MBSFN, &Nid_cell_mbsfn)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_NB_ANT_PORTS, &nb_antenna_ports)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_ROOT, &prach_root)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX, &prach_config_index)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PRACH_HIGH_SPEED, &prach_high_speed)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_ZERO_CORRELATION, &prach_zero_correlation)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET, &prach_freq_offset)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTA_SHIFT, &pucch_delta_shift)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_NRB_CQI, &pucch_nRB_CQI)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_NCS_AN, &pucch_nCS_AN)
+	      //printf("Component carrier %d\n",component_carrier);
+	      if (!(config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_TDD_CONFIG, &tdd_config)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_TDD_CONFIG_S, &tdd_config_s)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PREFIX_TYPE, &prefix_type)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PBCH_REPETITION, &pbch_repetition)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_EUTRA_BAND, &eutra_band)
+		    && config_setting_lookup_int64(component_carrier, ENB_CONFIG_STRING_DOWNLINK_FREQUENCY, &downlink_frequency)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UPLINK_FREQUENCY_OFFSET, &uplink_frequency_offset)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_NID_CELL, &Nid_cell)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_N_RB_DL, &N_RB_DL)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_CELL_MBSFN, &Nid_cell_mbsfn)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_NB_ANT_PORTS, &nb_antenna_ports)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_ROOT, &prach_root)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX, &prach_config_index)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PRACH_HIGH_SPEED, &prach_high_speed)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_ZERO_CORRELATION, &prach_zero_correlation)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET, &prach_freq_offset)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTA_SHIFT, &pucch_delta_shift)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_NRB_CQI, &pucch_nRB_CQI)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_NCS_AN, &pucch_nCS_AN)
 #if !defined(Rel10) && !defined(Rel14)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_N1_AN, &pucch_n1_AN)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_N1_AN, &pucch_n1_AN)
 #endif
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PDSCH_RS_EPRE, &pdsch_referenceSignalPower)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PDSCH_PB, &pdsch_p_b)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_N_SB, &pusch_n_SB)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE, &pusch_hoppingMode)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_HOPPINGOFFSET, &pusch_hoppingOffset)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM, &pusch_enable64QAM)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN, &pusch_groupHoppingEnabled)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_GROUP_ASSIGNMENT, &pusch_groupAssignment)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN, &pusch_sequenceHoppingEnabled)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_NDMRS1, &pusch_nDMRS1)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PHICH_DURATION, &phich_duration)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PHICH_RESOURCE, &phich_resource)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_ENABLE, &srs_enable)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_PO_NOMINAL, &pusch_p0_Nominal)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_ALPHA, &pusch_alpha)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, &pucch_p0_Nominal)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, &msg3_delta_Preamble)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, &pucch_deltaF_Format1)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, &pucch_deltaF_Format1b)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, &pucch_deltaF_Format2)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, &pucch_deltaF_Format2a)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, &pucch_deltaF_Format2b)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, &rach_numberOfRA_Preambles)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, &rach_preamblesGroupAConfig)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_POWERRAMPINGSTEP, &rach_powerRampingStep)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER, &rach_preambleInitialReceivedTargetPower)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLETRANSMAX, &rach_preambleTransMax)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, &rach_raResponseWindowSize)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, &rach_macContentionResolutionTimer)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &rach_maxHARQ_Msg3Tx)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &bcch_modificationPeriodCoeff)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE,  &pcch_defaultPagingCycle)
-            && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PCCH_NB,  &pcch_nB)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF,  &bcch_modificationPeriodCoeff)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T300,  &ue_TimersAndConstants_t300)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T301,  &ue_TimersAndConstants_t301)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T310,  &ue_TimersAndConstants_t310)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T311,  &ue_TimersAndConstants_t311)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_N310,  &ue_TimersAndConstants_n310)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_N311,  &ue_TimersAndConstants_n311)
-            && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UE_TRANSMISSION_MODE,  &ue_TransmissionMode)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PDSCH_RS_EPRE, &pdsch_referenceSignalPower)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PDSCH_PB, &pdsch_p_b)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_N_SB, &pusch_n_SB)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE, &pusch_hoppingMode)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_HOPPINGOFFSET, &pusch_hoppingOffset)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM, &pusch_enable64QAM)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN, &pusch_groupHoppingEnabled)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_GROUP_ASSIGNMENT, &pusch_groupAssignment)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN, &pusch_sequenceHoppingEnabled)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_NDMRS1, &pusch_nDMRS1)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PHICH_DURATION, &phich_duration)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PHICH_RESOURCE, &phich_resource)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_ENABLE, &srs_enable)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUSCH_PO_NOMINAL, &pusch_p0_Nominal)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUSCH_ALPHA, &pusch_alpha)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, &pucch_p0_Nominal)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, &msg3_delta_Preamble)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, &pucch_deltaF_Format1)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, &pucch_deltaF_Format1b)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, &pucch_deltaF_Format2)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, &pucch_deltaF_Format2a)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, &pucch_deltaF_Format2b)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, &rach_numberOfRA_Preambles)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, &rach_preamblesGroupAConfig)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_POWERRAMPINGSTEP, &rach_powerRampingStep)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER, &rach_preambleInitialReceivedTargetPower)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_PREAMBLETRANSMAX, &rach_preambleTransMax)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, &rach_raResponseWindowSize)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, &rach_macContentionResolutionTimer)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &rach_maxHARQ_Msg3Tx)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &bcch_modificationPeriodCoeff)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE,  &pcch_defaultPagingCycle)
+		    && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_PCCH_NB,  &pcch_nB)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF,  &bcch_modificationPeriodCoeff)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T300,  &ue_TimersAndConstants_t300)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T301,  &ue_TimersAndConstants_t301)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T310,  &ue_TimersAndConstants_t310)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_T311,  &ue_TimersAndConstants_t311)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_N310,  &ue_TimersAndConstants_n310)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UETIMERS_N311,  &ue_TimersAndConstants_n311)
+		    && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_UE_TRANSMISSION_MODE,  &ue_TransmissionMode)
 
 #if defined(Rel10) || defined(Rel14)
 
 
 #endif
-            )) {
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, Component Carrier %d!\n",
-                 RC.config_file_name, nb_cc++);
-        continue; // FIXME this prevents segfaults below, not sure what happens after function exit
-          }
+		    )) {
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, Component Carrier %d!\n",
+			     RC.config_file_name, nb_cc++);
+		continue; // FIXME this prevents segfaults below, not sure what happens after function exit
+	      }
 
-          nb_cc++;
-          /*
-        if (strcmp(cc_node_function, "eNodeB_3GPP") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = eNodeB_3GPP;
-        } else if (strcmp(cc_node_function, "eNodeB_3GPP_BBU") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = eNodeB_3GPP_BBU;
-        } else if (strcmp(cc_node_function, "NGFI_RCC_IF4p5") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = NGFI_RCC_IF4p5;
-        } else if (strcmp(cc_node_function, "NGFI_RAU_IF4p5") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = NGFI_RAU_IF4p5;
-        } else if (strcmp(cc_node_function, "NGFI_RRU_IF4p5") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = NGFI_RRU_IF4p5;
-        } else if (strcmp(cc_node_function, "NGFI_RRU_IF5") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = NGFI_RRU_IF5;
-        } else {
-        AssertError (0, parse_errors ++,
-        "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for node_function choice: eNodeB_3GPP or eNodeB_3GPP_BBU or NGFI_IF4_RCC or NGFI_IF4_RRU or NGFI_IF5_RRU !\n",
-        lib_config_file_name_pP, i, cc_node_function);
-        }
+	      nb_cc++;
+	      /*
+		if (strcmp(cc_node_function, "eNodeB_3GPP") == 0) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = eNodeB_3GPP;
+		} else if (strcmp(cc_node_function, "eNodeB_3GPP_BBU") == 0) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = eNodeB_3GPP_BBU;
+		} else if (strcmp(cc_node_function, "NGFI_RCC_IF4p5") == 0) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = NGFI_RCC_IF4p5;
+		} else if (strcmp(cc_node_function, "NGFI_RAU_IF4p5") == 0) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = NGFI_RAU_IF4p5;
+		} else if (strcmp(cc_node_function, "NGFI_RRU_IF4p5") == 0) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = NGFI_RRU_IF4p5;
+		} else if (strcmp(cc_node_function, "NGFI_RRU_IF5") == 0) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_function[j] = NGFI_RRU_IF5;
+		} else {
+		AssertError (0, parse_errors ++,
+		"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for node_function choice: eNodeB_3GPP or eNodeB_3GPP_BBU or NGFI_IF4_RCC or NGFI_IF4_RRU or NGFI_IF5_RRU !\n",
+		lib_config_file_name_pP, i, cc_node_function);
+		}
 
-        if (strcmp(cc_node_timing, "synch_to_ext_device") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_timing[j] = synch_to_ext_device;
-        } else if (strcmp(cc_node_timing, "synch_to_other") == 0) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_timing[j] = synch_to_other;
-        } else {
-        AssertError (0, parse_errors ++,
-        "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for node_function choice: SYNCH_TO_DEVICE or SYNCH_TO_OTHER !\n",
-        lib_config_file_name_pP, i, cc_node_timing);
-        }
+		if (strcmp(cc_node_timing, "synch_to_ext_device") == 0) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_timing[j] = synch_to_ext_device;
+		} else if (strcmp(cc_node_timing, "synch_to_other") == 0) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_timing[j] = synch_to_other;
+		} else {
+		AssertError (0, parse_errors ++,
+		"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for node_function choice: SYNCH_TO_DEVICE or SYNCH_TO_OTHER !\n",
+		lib_config_file_name_pP, i, cc_node_timing);
+		}
 
-        if ((cc_node_synch_ref >= -1) && (cc_node_synch_ref < num_component_carriers)) {
-        enb_properties_loc.properties[enb_properties_loc_index]->cc_node_synch_ref[j] = (int16_t) cc_node_synch_ref;
-        } else {
-        AssertError (0, parse_errors ++,
-        "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for node_synch_ref choice: valid CC_id or -1 !\n",
-        lib_config_file_name_pP, i, cc_node_synch_ref);
-        }
-          */
+		if ((cc_node_synch_ref >= -1) && (cc_node_synch_ref < num_component_carriers)) {
+		enb_properties_loc.properties[enb_properties_loc_index]->cc_node_synch_ref[j] = (int16_t) cc_node_synch_ref;
+		} else {
+		AssertError (0, parse_errors ++,
+		"Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for node_synch_ref choice: valid CC_id or -1 !\n",
+		lib_config_file_name_pP, i, cc_node_synch_ref);
+		}
+	      */
 
-          RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
+	      RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
 
-          AssertFatal (tdd_config <= TDD_Config__subframeAssignment_sa6,
-               "Failed to parse eNB configuration file %s, enb %d illegal tdd_config %d (should be 0-%d)!",
-               RC.config_file_name, i, tdd_config, TDD_Config__subframeAssignment_sa6);
+	      AssertFatal (tdd_config <= TDD_Config__subframeAssignment_sa6,
+			   "Failed to parse eNB configuration file %s, enb %d illegal tdd_config %d (should be 0-%d)!",
+			   RC.config_file_name, i, tdd_config, TDD_Config__subframeAssignment_sa6);
 
-          RRC_CONFIGURATION_REQ (msg_p).tdd_config_s[j] = tdd_config_s;
-          AssertFatal (tdd_config_s <= TDD_Config__specialSubframePatterns_ssp8,
-               "Failed to parse eNB configuration file %s, enb %d illegal tdd_config_s %d (should be 0-%d)!",
-               RC.config_file_name, i, tdd_config_s, TDD_Config__specialSubframePatterns_ssp8);
+	      RRC_CONFIGURATION_REQ (msg_p).tdd_config_s[j] = tdd_config_s;
+	      AssertFatal (tdd_config_s <= TDD_Config__specialSubframePatterns_ssp8,
+			   "Failed to parse eNB configuration file %s, enb %d illegal tdd_config_s %d (should be 0-%d)!",
+			   RC.config_file_name, i, tdd_config_s, TDD_Config__specialSubframePatterns_ssp8);
 
-          if (!prefix_type)
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d define %s: NORMAL,EXTENDED!\n",
-                 RC.config_file_name, i, ENB_CONFIG_STRING_PREFIX_TYPE);
-          else if (strcmp(prefix_type, "NORMAL") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = NORMAL;
-          }
-          else  if (strcmp(prefix_type, "EXTENDED") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = EXTENDED;
-          }
-          else {
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
-                RC.config_file_name, i, prefix_type);
-          }
+	      if (!prefix_type)
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d define %s: NORMAL,EXTENDED!\n",
+			     RC.config_file_name, i, ENB_CONFIG_STRING_PREFIX_TYPE);
+	      else if (strcmp(prefix_type, "NORMAL") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = NORMAL;
+	      }
+	      else  if (strcmp(prefix_type, "EXTENDED") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = EXTENDED;
+	      }
+	      else {
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
+			    RC.config_file_name, i, prefix_type);
+	      }
 #ifdef Rel14
-          if (!pbch_repetition)
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d define %s: TRUE,FALSE!\n",
-                RC.config_file_name, i, ENB_CONFIG_STRING_PBCH_REPETITION);
-          else if (strcmp(pbch_repetition, "TRUE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).pbch_repetition[j] = 1;
-          }
-          else  if (strcmp(pbch_repetition, "FALSE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).pbch_repetition[j] = 0;
-          }
-          else {
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pbch_repetition choice: TRUE or FALSE !\n",
-                RC.config_file_name, i, pbch_repetition);
-          }
+	      if (!pbch_repetition)
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d define %s: TRUE,FALSE!\n",
+			    RC.config_file_name, i, ENB_CONFIG_STRING_PBCH_REPETITION);
+	      else if (strcmp(pbch_repetition, "TRUE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).pbch_repetition[j] = 1;
+	      }
+	      else  if (strcmp(pbch_repetition, "FALSE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).pbch_repetition[j] = 0;
+	      }
+	      else {
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pbch_repetition choice: TRUE or FALSE !\n",
+			    RC.config_file_name, i, pbch_repetition);
+	      }
 #endif
 
-          RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
-          RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
-          RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j] = (unsigned int) uplink_frequency_offset;
-          RRC_CONFIGURATION_REQ (msg_p).Nid_cell[j]= Nid_cell;
+	      RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
+	      RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
+	      RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j] = (unsigned int) uplink_frequency_offset;
+	      RRC_CONFIGURATION_REQ (msg_p).Nid_cell[j]= Nid_cell;
 
-          if (Nid_cell>503) {
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for Nid_cell choice: 0...503 !\n",
-                 RC.config_file_name, i, Nid_cell);
-          }
+	      if (Nid_cell>503) {
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for Nid_cell choice: 0...503 !\n",
+			     RC.config_file_name, i, Nid_cell);
+	      }
 
-          RRC_CONFIGURATION_REQ (msg_p).N_RB_DL[j]= N_RB_DL;
+	      RRC_CONFIGURATION_REQ (msg_p).N_RB_DL[j]= N_RB_DL;
 
-          if ((N_RB_DL!=6) && (N_RB_DL!=15) && (N_RB_DL!=25) && (N_RB_DL!=50) && (N_RB_DL!=75) && (N_RB_DL!=100)) {
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for N_RB_DL choice: 6,15,25,50,75,100 !\n",
-                 RC.config_file_name, i, N_RB_DL);
-          }
+	      if ((N_RB_DL!=6) && (N_RB_DL!=15) && (N_RB_DL!=25) && (N_RB_DL!=50) && (N_RB_DL!=75) && (N_RB_DL!=100)) {
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for N_RB_DL choice: 6,15,25,50,75,100 !\n",
+			     RC.config_file_name, i, N_RB_DL);
+	      }
 
-          if (strcmp(frame_type, "FDD") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = FDD;
-          }
-          else  if (strcmp(frame_type, "TDD") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = TDD;
-          }
-          else {
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for frame_type choice: FDD or TDD !\n",
-                RC.config_file_name, i, frame_type);
-          }
+	      if (strcmp(frame_type, "FDD") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = FDD;
+	      }
+	      else  if (strcmp(frame_type, "TDD") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = TDD;
+	      }
+	      else {
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for frame_type choice: FDD or TDD !\n",
+			    RC.config_file_name, i, frame_type);
+	      }
 
 
-          RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
-          AssertFatal (tdd_config <= TDD_Config__subframeAssignment_sa6,
-               "Failed to parse eNB configuration file %s, enb %d illegal tdd_config %d (should be 0-%d)!",
-               RC.config_file_name, i, tdd_config, TDD_Config__subframeAssignment_sa6);
+	      RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
+	      AssertFatal (tdd_config <= TDD_Config__subframeAssignment_sa6,
+			   "Failed to parse eNB configuration file %s, enb %d illegal tdd_config %d (should be 0-%d)!",
+			   RC.config_file_name, i, tdd_config, TDD_Config__subframeAssignment_sa6);
 
 
-          RRC_CONFIGURATION_REQ (msg_p).tdd_config_s[j] = tdd_config_s;
-          AssertFatal (tdd_config_s <= TDD_Config__specialSubframePatterns_ssp8,
-               "Failed to parse eNB configuration file %s, enb %d illegal tdd_config_s %d (should be 0-%d)!",
-               RC.config_file_name, i, tdd_config_s, TDD_Config__specialSubframePatterns_ssp8);
+	      RRC_CONFIGURATION_REQ (msg_p).tdd_config_s[j] = tdd_config_s;
+	      AssertFatal (tdd_config_s <= TDD_Config__specialSubframePatterns_ssp8,
+			   "Failed to parse eNB configuration file %s, enb %d illegal tdd_config_s %d (should be 0-%d)!",
+			   RC.config_file_name, i, tdd_config_s, TDD_Config__specialSubframePatterns_ssp8);
 
 
 
-          if (!prefix_type)
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d define %s: NORMAL,EXTENDED!\n",
-                 RC.config_file_name, i, ENB_CONFIG_STRING_PREFIX_TYPE);
-          else if (strcmp(prefix_type, "NORMAL") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = NORMAL;
-          }
-          else  if (strcmp(prefix_type, "EXTENDED") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = EXTENDED;
-          }
-          else {
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
-                RC.config_file_name, i, prefix_type);
-          }
+	      if (!prefix_type)
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d define %s: NORMAL,EXTENDED!\n",
+			     RC.config_file_name, i, ENB_CONFIG_STRING_PREFIX_TYPE);
+	      else if (strcmp(prefix_type, "NORMAL") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = NORMAL;
+	      }
+	      else  if (strcmp(prefix_type, "EXTENDED") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).prefix_type[j] = EXTENDED;
+	      }
+	      else {
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
+			    RC.config_file_name, i, prefix_type);
+	      }
 
 
 
-          RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
-          // printf( "\teutra band:\t%d\n",RRC_CONFIGURATION_REQ (msg_p).eutra_band);
+	      RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
+	      // printf( "\teutra band:\t%d\n",RRC_CONFIGURATION_REQ (msg_p).eutra_band);
 
 
 
-          RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
-          //printf( "\tdownlink freq:\t%u\n",RRC_CONFIGURATION_REQ (msg_p).downlink_frequency);
+	      RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
+	      //printf( "\tdownlink freq:\t%u\n",RRC_CONFIGURATION_REQ (msg_p).downlink_frequency);
 
 
-          RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j] = (unsigned int) uplink_frequency_offset;
+	      RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j] = (unsigned int) uplink_frequency_offset;
 
-          if (enb_check_band_frequencies(RC.config_file_name,
-                         j,
-                         RRC_CONFIGURATION_REQ (msg_p).eutra_band[j],
-                         RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j],
-                         RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j],
-                         RRC_CONFIGURATION_REQ (msg_p).frame_type[j])) {
-        AssertFatal(0, "error calling enb_check_band_frequencies\n");
-          }
+	      if (enb_check_band_frequencies(RC.config_file_name,
+					     j,
+					     RRC_CONFIGURATION_REQ (msg_p).eutra_band[j],
+					     RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j],
+					     RRC_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[j],
+					     RRC_CONFIGURATION_REQ (msg_p).frame_type[j])) {
+		AssertFatal(0, "error calling enb_check_band_frequencies\n");
+	      }
 
-          if ((nb_antenna_ports <1) || (nb_antenna_ports > 2))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for nb_antenna_ports choice: 1..2 !\n",
-                 RC.config_file_name, i, nb_antenna_ports);
+	      if ((nb_antenna_ports <1) || (nb_antenna_ports > 2))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for nb_antenna_ports choice: 1..2 !\n",
+			     RC.config_file_name, i, nb_antenna_ports);
 
-          RRC_CONFIGURATION_REQ (msg_p).nb_antenna_ports[j] = nb_antenna_ports;
+	      RRC_CONFIGURATION_REQ (msg_p).nb_antenna_ports[j] = nb_antenna_ports;
 
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_root =  prach_root;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_root =  prach_root;
 
-          if ((prach_root <0) || (prach_root > 1023))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_root choice: 0..1023 !\n",
-                 RC.config_file_name, i, prach_root);
+	      if ((prach_root <0) || (prach_root > 1023))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_root choice: 0..1023 !\n",
+			     RC.config_file_name, i, prach_root);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_config_index = prach_config_index;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_config_index = prach_config_index;
 
-          if ((prach_config_index <0) || (prach_config_index > 63))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_config_index choice: 0..1023 !\n",
-                 RC.config_file_name, i, prach_config_index);
+	      if ((prach_config_index <0) || (prach_config_index > 63))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_config_index choice: 0..1023 !\n",
+			     RC.config_file_name, i, prach_config_index);
 
-          if (!prach_high_speed)
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-                 RC.config_file_name, i, ENB_CONFIG_STRING_PRACH_HIGH_SPEED);
-          else if (strcmp(prach_high_speed, "ENABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].prach_high_speed = TRUE;
-          }
-          else if (strcmp(prach_high_speed, "DISABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].prach_high_speed = FALSE;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prach_config choice: ENABLE,DISABLE !\n",
-                RC.config_file_name, i, prach_high_speed);
+	      if (!prach_high_speed)
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+			     RC.config_file_name, i, ENB_CONFIG_STRING_PRACH_HIGH_SPEED);
+	      else if (strcmp(prach_high_speed, "ENABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].prach_high_speed = TRUE;
+	      }
+	      else if (strcmp(prach_high_speed, "DISABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].prach_high_speed = FALSE;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prach_config choice: ENABLE,DISABLE !\n",
+			    RC.config_file_name, i, prach_high_speed);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_zero_correlation =prach_zero_correlation;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_zero_correlation =prach_zero_correlation;
 
-          if ((prach_zero_correlation <0) || (prach_zero_correlation > 15))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_zero_correlation choice: 0..15!\n",
-                 RC.config_file_name, i, prach_zero_correlation);
+	      if ((prach_zero_correlation <0) || (prach_zero_correlation > 15))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_zero_correlation choice: 0..15!\n",
+			     RC.config_file_name, i, prach_zero_correlation);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_freq_offset = prach_freq_offset;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].prach_freq_offset = prach_freq_offset;
 
-          if ((prach_freq_offset <0) || (prach_freq_offset > 94))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_freq_offset choice: 0..94!\n",
-                 RC.config_file_name, i, prach_freq_offset);
+	      if ((prach_freq_offset <0) || (prach_freq_offset > 94))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_freq_offset choice: 0..94!\n",
+			     RC.config_file_name, i, prach_freq_offset);
 
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_delta_shift = pucch_delta_shift-1;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_delta_shift = pucch_delta_shift-1;
 
-          if ((pucch_delta_shift <1) || (pucch_delta_shift > 3))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_delta_shift choice: 1..3!\n",
-                 RC.config_file_name, i, pucch_delta_shift);
+	      if ((pucch_delta_shift <1) || (pucch_delta_shift > 3))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_delta_shift choice: 1..3!\n",
+			     RC.config_file_name, i, pucch_delta_shift);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_nRB_CQI = pucch_nRB_CQI;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_nRB_CQI = pucch_nRB_CQI;
 
-          if ((pucch_nRB_CQI <0) || (pucch_nRB_CQI > 98))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nRB_CQI choice: 0..98!\n",
-                 RC.config_file_name, i, pucch_nRB_CQI);
+	      if ((pucch_nRB_CQI <0) || (pucch_nRB_CQI > 98))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nRB_CQI choice: 0..98!\n",
+			     RC.config_file_name, i, pucch_nRB_CQI);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_nCS_AN = pucch_nCS_AN;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_nCS_AN = pucch_nCS_AN;
 
-          if ((pucch_nCS_AN <0) || (pucch_nCS_AN > 7))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
-                 RC.config_file_name, i, pucch_nCS_AN);
+	      if ((pucch_nCS_AN <0) || (pucch_nCS_AN > 7))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
+			     RC.config_file_name, i, pucch_nCS_AN);
 
 #if !defined(Rel10) && !defined(Rel14)
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_n1_AN = pucch_n1_AN;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_n1_AN = pucch_n1_AN;
 
-          if ((pucch_n1_AN <0) || (pucch_n1_AN > 2047))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_n1_AN choice: 0..2047!\n",
-                 RC.config_file_name, i, pucch_n1_AN);
+	      if ((pucch_n1_AN <0) || (pucch_n1_AN > 2047))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_n1_AN choice: 0..2047!\n",
+			     RC.config_file_name, i, pucch_n1_AN);
 
 #endif
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
 
-          if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_referenceSignalPower choice:-60..50!\n",
-                 RC.config_file_name, i, pdsch_referenceSignalPower);
+	      if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_referenceSignalPower choice:-60..50!\n",
+			     RC.config_file_name, i, pdsch_referenceSignalPower);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_p_b = pdsch_p_b;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_p_b = pdsch_p_b;
 
-          if ((pdsch_p_b <0) || (pdsch_p_b > 3))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_p_b choice: 0..3!\n",
-                 RC.config_file_name, i, pdsch_p_b);
+	      if ((pdsch_p_b <0) || (pdsch_p_b > 3))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_p_b choice: 0..3!\n",
+			     RC.config_file_name, i, pdsch_p_b);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_n_SB = pusch_n_SB;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_n_SB = pusch_n_SB;
 
-          if ((pusch_n_SB <1) || (pusch_n_SB > 4))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_n_SB choice: 1..4!\n",
-                 RC.config_file_name, i, pusch_n_SB);
+	      if ((pusch_n_SB <1) || (pusch_n_SB > 4))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_n_SB choice: 1..4!\n",
+			     RC.config_file_name, i, pusch_n_SB);
 
-          if (!pusch_hoppingMode)
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d define %s: interSubframe,intraAndInterSubframe!\n",
-                 RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE);
-          else if (strcmp(pusch_hoppingMode, "interSubFrame") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_interSubFrame;
-          }
-          else if (strcmp(pusch_hoppingMode, "intraAndInterSubFrame") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_intraAndInterSubFrame;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingMode choice: interSubframe,intraAndInterSubframe!\n",
-                RC.config_file_name, i, pusch_hoppingMode);
+	      if (!pusch_hoppingMode)
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d define %s: interSubframe,intraAndInterSubframe!\n",
+			     RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE);
+	      else if (strcmp(pusch_hoppingMode, "interSubFrame") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_interSubFrame;
+	      }
+	      else if (strcmp(pusch_hoppingMode, "intraAndInterSubFrame") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_intraAndInterSubFrame;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingMode choice: interSubframe,intraAndInterSubframe!\n",
+			    RC.config_file_name, i, pusch_hoppingMode);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_hoppingOffset = pusch_hoppingOffset;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_hoppingOffset = pusch_hoppingOffset;
 
-          if ((pusch_hoppingOffset<0) || (pusch_hoppingOffset>98))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingOffset choice: 0..98!\n",
-                 RC.config_file_name, i, pusch_hoppingMode);
+	      if ((pusch_hoppingOffset<0) || (pusch_hoppingOffset>98))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingOffset choice: 0..98!\n",
+			     RC.config_file_name, i, pusch_hoppingMode);
 
-          if (!pusch_enable64QAM)
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-                 RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM);
-          else if (strcmp(pusch_enable64QAM, "ENABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_enable64QAM = TRUE;
-          }
-          else if (strcmp(pusch_enable64QAM, "DISABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_enable64QAM = FALSE;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_enable64QAM choice: ENABLE,DISABLE!\n",
-                RC.config_file_name, i, pusch_enable64QAM);
+	      if (!pusch_enable64QAM)
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+			     RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM);
+	      else if (strcmp(pusch_enable64QAM, "ENABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_enable64QAM = TRUE;
+	      }
+	      else if (strcmp(pusch_enable64QAM, "DISABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_enable64QAM = FALSE;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_enable64QAM choice: ENABLE,DISABLE!\n",
+			    RC.config_file_name, i, pusch_enable64QAM);
 
-          if (!pusch_groupHoppingEnabled)
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-                RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN);
-          else if (strcmp(pusch_groupHoppingEnabled, "ENABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_groupHoppingEnabled = TRUE;
-          }
-          else if (strcmp(pusch_groupHoppingEnabled, "DISABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_groupHoppingEnabled = FALSE;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_groupHoppingEnabled choice: ENABLE,DISABLE!\n",
-                RC.config_file_name, i, pusch_groupHoppingEnabled);
+	      if (!pusch_groupHoppingEnabled)
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+			    RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN);
+	      else if (strcmp(pusch_groupHoppingEnabled, "ENABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_groupHoppingEnabled = TRUE;
+	      }
+	      else if (strcmp(pusch_groupHoppingEnabled, "DISABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_groupHoppingEnabled = FALSE;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_groupHoppingEnabled choice: ENABLE,DISABLE!\n",
+			    RC.config_file_name, i, pusch_groupHoppingEnabled);
 
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_groupAssignment = pusch_groupAssignment;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_groupAssignment = pusch_groupAssignment;
 
-          if ((pusch_groupAssignment<0)||(pusch_groupAssignment>29))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_groupAssignment choice: 0..29!\n",
-                 RC.config_file_name, i, pusch_groupAssignment);
+	      if ((pusch_groupAssignment<0)||(pusch_groupAssignment>29))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_groupAssignment choice: 0..29!\n",
+			     RC.config_file_name, i, pusch_groupAssignment);
 
-          if (!pusch_sequenceHoppingEnabled)
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-                 RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN);
-          else if (strcmp(pusch_sequenceHoppingEnabled, "ENABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_sequenceHoppingEnabled = TRUE;
-          }
-          else if (strcmp(pusch_sequenceHoppingEnabled, "DISABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_sequenceHoppingEnabled = FALSE;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_sequenceHoppingEnabled choice: ENABLE,DISABLE!\n",
-                RC.config_file_name, i, pusch_sequenceHoppingEnabled);
+	      if (!pusch_sequenceHoppingEnabled)
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+			     RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN);
+	      else if (strcmp(pusch_sequenceHoppingEnabled, "ENABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_sequenceHoppingEnabled = TRUE;
+	      }
+	      else if (strcmp(pusch_sequenceHoppingEnabled, "DISABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_sequenceHoppingEnabled = FALSE;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_sequenceHoppingEnabled choice: ENABLE,DISABLE!\n",
+			    RC.config_file_name, i, pusch_sequenceHoppingEnabled);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_nDMRS1 = pusch_nDMRS1;  //cyclic_shift in RRC!
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pusch_nDMRS1 = pusch_nDMRS1;  //cyclic_shift in RRC!
 
-          if ((pusch_nDMRS1 <0) || (pusch_nDMRS1>7))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_nDMRS1 choice: 0..7!\n",
-                 RC.config_file_name, i, pusch_nDMRS1);
+	      if ((pusch_nDMRS1 <0) || (pusch_nDMRS1>7))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_nDMRS1 choice: 0..7!\n",
+			     RC.config_file_name, i, pusch_nDMRS1);
 
-          if (strcmp(phich_duration, "NORMAL") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration = PHICH_Config__phich_Duration_normal;
-          }
-          else if (strcmp(phich_duration, "EXTENDED") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration = PHICH_Config__phich_Duration_extended;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_duration choice: NORMAL,EXTENDED!\n",
-                RC.config_file_name, i, phich_duration);
+	      if (strcmp(phich_duration, "NORMAL") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration = PHICH_Config__phich_Duration_normal;
+	      }
+	      else if (strcmp(phich_duration, "EXTENDED") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration = PHICH_Config__phich_Duration_extended;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_duration choice: NORMAL,EXTENDED!\n",
+			    RC.config_file_name, i, phich_duration);
 
-          if (strcmp(phich_resource, "ONESIXTH") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_oneSixth;
-          }
-          else if (strcmp(phich_resource, "HALF") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_half;
-          }
-          else if (strcmp(phich_resource, "ONE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_one;
-          }
-          else if (strcmp(phich_resource, "TWO") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_two;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_resource choice: ONESIXTH,HALF,ONE,TWO!\n",
-                RC.config_file_name, i, phich_resource);
+	      if (strcmp(phich_resource, "ONESIXTH") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_oneSixth;
+	      }
+	      else if (strcmp(phich_resource, "HALF") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_half;
+	      }
+	      else if (strcmp(phich_resource, "ONE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_one;
+	      }
+	      else if (strcmp(phich_resource, "TWO") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource = PHICH_Config__phich_Resource_two;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_resource choice: ONESIXTH,HALF,ONE,TWO!\n",
+			    RC.config_file_name, i, phich_resource);
 
-          printf("phich.resource %d (%s), phich.duration %d (%s)\n",
-             (int)RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource, phich_resource,
-             (int)RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration, phich_duration);
+	      printf("phich.resource %d (%s), phich.duration %d (%s)\n",
+		     (int)RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_resource, phich_resource,
+		     (int)RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].phich_duration, phich_duration);
 
-          if (strcmp(srs_enable, "ENABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_enable = TRUE;
-          }
-          else if (strcmp(srs_enable, "DISABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_enable = FALSE;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
-                RC.config_file_name, i, srs_enable);
+	      if (strcmp(srs_enable, "ENABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_enable = TRUE;
+	      }
+	      else if (strcmp(srs_enable, "DISABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_enable = FALSE;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
+			    RC.config_file_name, i, srs_enable);
 
-          if (RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_enable == TRUE) {
-        if (!(config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_SRS_BANDWIDTH_CONFIG, &srs_BandwidthConfig)
-              && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_SRS_SUBFRAME_CONFIG, &srs_SubframeConfig)
-              && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_ACKNACKST_CONFIG, &srs_ackNackST)
-              && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_MAXUPPTS, &srs_MaxUpPts)
-              ))
-          AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown values for srs_BandwidthConfig, srs_SubframeConfig, srs_ackNackST, srs_MaxUpPts\n",
-                  RC.config_file_name, i);
+	      if (RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_enable == TRUE) {
+		if (!(config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_SRS_BANDWIDTH_CONFIG, &srs_BandwidthConfig)
+		      && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_SRS_SUBFRAME_CONFIG, &srs_SubframeConfig)
+		      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_ACKNACKST_CONFIG, &srs_ackNackST)
+		      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_SRS_MAXUPPTS, &srs_MaxUpPts)
+		      ))
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown values for srs_BandwidthConfig, srs_SubframeConfig, srs_ackNackST, srs_MaxUpPts\n",
+			      RC.config_file_name, i);
 
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_BandwidthConfig = srs_BandwidthConfig;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_BandwidthConfig = srs_BandwidthConfig;
 
-        if ((srs_BandwidthConfig < 0) || (srs_BandwidthConfig >7))
-          AssertFatal (0, "Failed to parse eNB configuration file %s, enb %d unknown value %d for srs_BandwidthConfig choice: 0...7\n",
-                   RC.config_file_name, i, srs_BandwidthConfig);
+		if ((srs_BandwidthConfig < 0) || (srs_BandwidthConfig >7))
+		  AssertFatal (0, "Failed to parse eNB configuration file %s, enb %d unknown value %d for srs_BandwidthConfig choice: 0...7\n",
+			       RC.config_file_name, i, srs_BandwidthConfig);
 
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_SubframeConfig = srs_SubframeConfig;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].srs_SubframeConfig = srs_SubframeConfig;
 
-        if ((srs_SubframeConfig<0) || (srs_SubframeConfig>15))
-          AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for srs_SubframeConfig choice: 0..15 !\n",
-                   RC.config_file_name, i, srs_SubframeConfig);
+		if ((srs_SubframeConfig<0) || (srs_SubframeConfig>15))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for srs_SubframeConfig choice: 0..15 !\n",
+			       RC.config_file_name, i, srs_SubframeConfig);
 
-        if (strcmp(srs_ackNackST, "ENABLE") == 0) {
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_ackNackST = TRUE;
-        }
-        else if (strcmp(srs_ackNackST, "DISABLE") == 0) {
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_ackNackST = FALSE;
-        }
-        else
-          AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
-                  RC.config_file_name, i, srs_ackNackST);
+		if (strcmp(srs_ackNackST, "ENABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_ackNackST = TRUE;
+		}
+		else if (strcmp(srs_ackNackST, "DISABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_ackNackST = FALSE;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
+			      RC.config_file_name, i, srs_ackNackST);
 
-        if (strcmp(srs_MaxUpPts, "ENABLE") == 0) {
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_MaxUpPts = TRUE;
-        }
-        else if (strcmp(srs_MaxUpPts, "DISABLE") == 0) {
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_MaxUpPts = FALSE;
-        }
-        else
-          AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_MaxUpPts choice: ENABLE,DISABLE !\n",
-                  RC.config_file_name, i, srs_MaxUpPts);
-          }
+		if (strcmp(srs_MaxUpPts, "ENABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_MaxUpPts = TRUE;
+		}
+		else if (strcmp(srs_MaxUpPts, "DISABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].srs_MaxUpPts = FALSE;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_MaxUpPts choice: ENABLE,DISABLE !\n",
+			      RC.config_file_name, i, srs_MaxUpPts);
+	      }
 
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_p0_Nominal = pusch_p0_Nominal;
+	      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_p0_Nominal = pusch_p0_Nominal;
 
-          if ((pusch_p0_Nominal < -126) || (pusch_p0_Nominal > 24))
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
-                RC.config_file_name, i, pusch_p0_Nominal);
+	      if ((pusch_p0_Nominal < -126) || (pusch_p0_Nominal > 24))
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
+			    RC.config_file_name, i, pusch_p0_Nominal);
 
 #ifndef Rel14
-          if (strcmp(pusch_alpha, "AL0") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al0;
-          }
-          else if (strcmp(pusch_alpha, "AL04") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al04;
-          }
-          else if (strcmp(pusch_alpha, "AL05") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al05;
-          }
-          else if (strcmp(pusch_alpha, "AL06") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al06;
-          }
-          else if (strcmp(pusch_alpha, "AL07") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al07;
-          }
-          else if (strcmp(pusch_alpha, "AL08") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al08;
-          }
-          else if (strcmp(pusch_alpha, "AL09") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al09;
-          }
-          else if (strcmp(pusch_alpha, "AL1") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al1;
-          }
+	      if (strcmp(pusch_alpha, "AL0") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al0;
+	      }
+	      else if (strcmp(pusch_alpha, "AL04") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al04;
+	      }
+	      else if (strcmp(pusch_alpha, "AL05") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al05;
+	      }
+	      else if (strcmp(pusch_alpha, "AL06") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al06;
+	      }
+	      else if (strcmp(pusch_alpha, "AL07") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al07;
+	      }
+	      else if (strcmp(pusch_alpha, "AL08") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al08;
+	      }
+	      else if (strcmp(pusch_alpha, "AL09") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al09;
+	      }
+	      else if (strcmp(pusch_alpha, "AL1") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al1;
+	      }
 #else
-          if (strcmp(pusch_alpha, "AL0") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al0;
-          }
-          else if (strcmp(pusch_alpha, "AL04") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al04;
-          }
-          else if (strcmp(pusch_alpha, "AL05") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al05;
-          }
-          else if (strcmp(pusch_alpha, "AL06") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al06;
-          }
-          else if (strcmp(pusch_alpha, "AL07") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al07;
-          }
-          else if (strcmp(pusch_alpha, "AL08") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al08;
-          }
-          else if (strcmp(pusch_alpha, "AL09") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al09;
-          }
-          else if (strcmp(pusch_alpha, "AL1") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al1;
-          }
+	      if (strcmp(pusch_alpha, "AL0") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al0;
+	      }
+	      else if (strcmp(pusch_alpha, "AL04") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al04;
+	      }
+	      else if (strcmp(pusch_alpha, "AL05") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al05;
+	      }
+	      else if (strcmp(pusch_alpha, "AL06") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al06;
+	      }
+	      else if (strcmp(pusch_alpha, "AL07") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al07;
+	      }
+	      else if (strcmp(pusch_alpha, "AL08") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al08;
+	      }
+	      else if (strcmp(pusch_alpha, "AL09") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al09;
+	      }
+	      else if (strcmp(pusch_alpha, "AL1") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al1;
+	      }
 #endif
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
-                RC.config_file_name, i, pusch_alpha);
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
+			    RC.config_file_name, i, pusch_alpha);
 
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_p0_Nominal = pucch_p0_Nominal;
+	      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_p0_Nominal = pucch_p0_Nominal;
 
-          if ((pucch_p0_Nominal < -127) || (pucch_p0_Nominal > -96))
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_p0_Nominal choice: -127..-96 !\n",
-                RC.config_file_name, i, pucch_p0_Nominal);
+	      if ((pucch_p0_Nominal < -127) || (pucch_p0_Nominal > -96))
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_p0_Nominal choice: -127..-96 !\n",
+			    RC.config_file_name, i, pucch_p0_Nominal);
 
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].msg3_delta_Preamble = msg3_delta_Preamble;
+	      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].msg3_delta_Preamble = msg3_delta_Preamble;
 
-          if ((msg3_delta_Preamble < -1) || (msg3_delta_Preamble > 6))
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for msg3_delta_Preamble choice: -1..6 !\n",
-                RC.config_file_name, i, msg3_delta_Preamble);
+	      if ((msg3_delta_Preamble < -1) || (msg3_delta_Preamble > 6))
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for msg3_delta_Preamble choice: -1..6 !\n",
+			    RC.config_file_name, i, msg3_delta_Preamble);
 
 
-          if (strcmp(pucch_deltaF_Format1, "deltaF_2") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1 = DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF_2;
-          }
-          else if (strcmp(pucch_deltaF_Format1, "deltaF0") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF0;
-          }
-          else if (strcmp(pucch_deltaF_Format1, "deltaF2") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF2;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1 choice: deltaF_2,dltaF0,deltaF2!\n",
-                RC.config_file_name, i, pucch_deltaF_Format1);
+	      if (strcmp(pucch_deltaF_Format1, "deltaF_2") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1 = DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF_2;
+	      }
+	      else if (strcmp(pucch_deltaF_Format1, "deltaF0") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF0;
+	      }
+	      else if (strcmp(pucch_deltaF_Format1, "deltaF2") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF2;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1 choice: deltaF_2,dltaF0,deltaF2!\n",
+			    RC.config_file_name, i, pucch_deltaF_Format1);
 
-          if (strcmp(pucch_deltaF_Format1b, "deltaF1") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF1;
-          }
-          else if (strcmp(pucch_deltaF_Format1b, "deltaF3") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF3;
-          }
-          else if (strcmp(pucch_deltaF_Format1b, "deltaF5") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF5;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1b choice: deltaF1,dltaF3,deltaF5!\n",
-                RC.config_file_name, i, pucch_deltaF_Format1b);
+	      if (strcmp(pucch_deltaF_Format1b, "deltaF1") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF1;
+	      }
+	      else if (strcmp(pucch_deltaF_Format1b, "deltaF3") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF3;
+	      }
+	      else if (strcmp(pucch_deltaF_Format1b, "deltaF5") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF5;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1b choice: deltaF1,dltaF3,deltaF5!\n",
+			    RC.config_file_name, i, pucch_deltaF_Format1b);
 
 
-          if (strcmp(pucch_deltaF_Format2, "deltaF_2") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF_2;
-          }
-          else if (strcmp(pucch_deltaF_Format2, "deltaF0") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF0;
-          }
-          else if (strcmp(pucch_deltaF_Format2, "deltaF1") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF1;
-          }
-          else if (strcmp(pucch_deltaF_Format2, "deltaF2") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF2;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2 choice: deltaF_2,dltaF0,deltaF1,deltaF2!\n",
-                RC.config_file_name, i, pucch_deltaF_Format2);
+	      if (strcmp(pucch_deltaF_Format2, "deltaF_2") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF_2;
+	      }
+	      else if (strcmp(pucch_deltaF_Format2, "deltaF0") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF0;
+	      }
+	      else if (strcmp(pucch_deltaF_Format2, "deltaF1") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF1;
+	      }
+	      else if (strcmp(pucch_deltaF_Format2, "deltaF2") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF2;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2 choice: deltaF_2,dltaF0,deltaF1,deltaF2!\n",
+			    RC.config_file_name, i, pucch_deltaF_Format2);
 
-          if (strcmp(pucch_deltaF_Format2a, "deltaF_2") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF_2;
-          }
-          else if (strcmp(pucch_deltaF_Format2a, "deltaF0") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF0;
-          }
-          else if (strcmp(pucch_deltaF_Format2a, "deltaF2") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF2;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2a choice: deltaF_2,dltaF0,deltaF2!\n",
-                RC.config_file_name, i, pucch_deltaF_Format2a);
+	      if (strcmp(pucch_deltaF_Format2a, "deltaF_2") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF_2;
+	      }
+	      else if (strcmp(pucch_deltaF_Format2a, "deltaF0") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF0;
+	      }
+	      else if (strcmp(pucch_deltaF_Format2a, "deltaF2") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF2;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2a choice: deltaF_2,dltaF0,deltaF2!\n",
+			    RC.config_file_name, i, pucch_deltaF_Format2a);
 
-          if (strcmp(pucch_deltaF_Format2b, "deltaF_2") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF_2;
-          }
-          else if (strcmp(pucch_deltaF_Format2b, "deltaF0") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF0;
-          }
-          else if (strcmp(pucch_deltaF_Format2b, "deltaF2") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF2;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2b choice: deltaF_2,dltaF0,deltaF2!\n",
-                RC.config_file_name, i, pucch_deltaF_Format2b);
+	      if (strcmp(pucch_deltaF_Format2b, "deltaF_2") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF_2;
+	      }
+	      else if (strcmp(pucch_deltaF_Format2b, "deltaF0") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF0;
+	      }
+	      else if (strcmp(pucch_deltaF_Format2b, "deltaF2") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF2;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2b choice: deltaF_2,dltaF0,deltaF2!\n",
+			    RC.config_file_name, i, pucch_deltaF_Format2b);
 
 
 
 
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
+	      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
 
-          if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_numberOfRA_Preambles choice: 4,8,12,...,64!\n",
-                RC.config_file_name, i, rach_numberOfRA_Preambles);
+	      if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_numberOfRA_Preambles choice: 4,8,12,...,64!\n",
+			    RC.config_file_name, i, rach_numberOfRA_Preambles);
 
-          if (strcmp(rach_preamblesGroupAConfig, "ENABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_preamblesGroupAConfig= TRUE;
+	      if (strcmp(rach_preamblesGroupAConfig, "ENABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_preamblesGroupAConfig= TRUE;
 
-        if (!(config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, &rach_sizeOfRA_PreamblesGroupA)
-              && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, &rach_messageSizeGroupA)
-              && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_RACH_MESSAGEPOWEROFFSETGROUPB, &rach_messagePowerOffsetGroupB)))
-          AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d  rach_sizeOfRA_PreamblesGroupA, messageSizeGroupA,messagePowerOffsetGroupB!\n",
-                   RC.config_file_name, i);
+		if (!(config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, &rach_sizeOfRA_PreamblesGroupA)
+		      && config_setting_lookup_int(component_carrier, ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, &rach_messageSizeGroupA)
+		      && config_setting_lookup_string(component_carrier, ENB_CONFIG_STRING_RACH_MESSAGEPOWEROFFSETGROUPB, &rach_messagePowerOffsetGroupB)))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d  rach_sizeOfRA_PreamblesGroupA, messageSizeGroupA,messagePowerOffsetGroupB!\n",
+			       RC.config_file_name, i);
 
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_sizeOfRA_PreamblesGroupA= (rach_sizeOfRA_PreamblesGroupA/4)-1;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_sizeOfRA_PreamblesGroupA= (rach_sizeOfRA_PreamblesGroupA/4)-1;
 
-        if ((rach_numberOfRA_Preambles <4) || (rach_numberOfRA_Preambles>60) || ((rach_numberOfRA_Preambles&3)!=0))
-          AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_sizeOfRA_PreamblesGroupA choice: 4,8,12,...,60!\n",
-                   RC.config_file_name, i, rach_sizeOfRA_PreamblesGroupA);
+		if ((rach_numberOfRA_Preambles <4) || (rach_numberOfRA_Preambles>60) || ((rach_numberOfRA_Preambles&3)!=0))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_sizeOfRA_PreamblesGroupA choice: 4,8,12,...,60!\n",
+			       RC.config_file_name, i, rach_sizeOfRA_PreamblesGroupA);
 
 
-        switch (rach_messageSizeGroupA) {
-        case 56:
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b56;
-          break;
+		switch (rach_messageSizeGroupA) {
+		case 56:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b56;
+		  break;
 
-        case 144:
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b144;
-          break;
+		case 144:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b144;
+		  break;
 
-        case 208:
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b208;
-          break;
+		case 208:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b208;
+		  break;
 
-        case 256:
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b256;
-          break;
+		case 256:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b256;
+		  break;
 
-        default:
-          AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_messageSizeGroupA choice: 56,144,208,256!\n",
-                   RC.config_file_name, i, rach_messageSizeGroupA);
-          break;
-        }
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_messageSizeGroupA choice: 56,144,208,256!\n",
+			       RC.config_file_name, i, rach_messageSizeGroupA);
+		  break;
+		}
 
-        if (strcmp(rach_messagePowerOffsetGroupB,"minusinfinity")==0) {
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_minusinfinity;
-        }
+		if (strcmp(rach_messagePowerOffsetGroupB,"minusinfinity")==0) {
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_minusinfinity;
+		}
 
-        else if (strcmp(rach_messagePowerOffsetGroupB,"dB0")==0) {
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB0;
-        }
+		else if (strcmp(rach_messagePowerOffsetGroupB,"dB0")==0) {
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB0;
+		}
 
-        else if (strcmp(rach_messagePowerOffsetGroupB,"dB5")==0) {
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB5;
-        }
+		else if (strcmp(rach_messagePowerOffsetGroupB,"dB5")==0) {
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB5;
+		}
 
-        else if (strcmp(rach_messagePowerOffsetGroupB,"dB8")==0) {
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB8;
-        }
+		else if (strcmp(rach_messagePowerOffsetGroupB,"dB8")==0) {
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB8;
+		}
 
-        else if (strcmp(rach_messagePowerOffsetGroupB,"dB10")==0) {
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB10;
-        }
+		else if (strcmp(rach_messagePowerOffsetGroupB,"dB10")==0) {
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB10;
+		}
 
-        else if (strcmp(rach_messagePowerOffsetGroupB,"dB12")==0) {
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB12;
-        }
+		else if (strcmp(rach_messagePowerOffsetGroupB,"dB12")==0) {
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB12;
+		}
 
-        else if (strcmp(rach_messagePowerOffsetGroupB,"dB15")==0) {
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB15;
-        }
+		else if (strcmp(rach_messagePowerOffsetGroupB,"dB15")==0) {
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB15;
+		}
 
-        else if (strcmp(rach_messagePowerOffsetGroupB,"dB18")==0) {
-          RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB18;
-        }
-        else
-          AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_messagePowerOffsetGroupB choice: minusinfinity,dB0,dB5,dB8,dB10,dB12,dB15,dB18!\n",
-                  RC.config_file_name, i, rach_messagePowerOffsetGroupB);
+		else if (strcmp(rach_messagePowerOffsetGroupB,"dB18")==0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB18;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_messagePowerOffsetGroupB choice: minusinfinity,dB0,dB5,dB8,dB10,dB12,dB15,dB18!\n",
+			      RC.config_file_name, i, rach_messagePowerOffsetGroupB);
 
-          }
-          else if (strcmp(rach_preamblesGroupAConfig, "DISABLE") == 0) {
-        RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_preamblesGroupAConfig= FALSE;
-          }
-          else
-        AssertFatal(0,
-                "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_preamblesGroupAConfig choice: ENABLE,DISABLE !\n",
-                RC.config_file_name, i, rach_preamblesGroupAConfig);
+	      }
+	      else if (strcmp(rach_preamblesGroupAConfig, "DISABLE") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].rach_preamblesGroupAConfig= FALSE;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_preamblesGroupAConfig choice: ENABLE,DISABLE !\n",
+			    RC.config_file_name, i, rach_preamblesGroupAConfig);
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleInitialReceivedTargetPower= (rach_preambleInitialReceivedTargetPower+120)/2;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleInitialReceivedTargetPower= (rach_preambleInitialReceivedTargetPower+120)/2;
 
-          if ((rach_preambleInitialReceivedTargetPower<-120) || (rach_preambleInitialReceivedTargetPower>-90) || ((rach_preambleInitialReceivedTargetPower&1)!=0))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleInitialReceivedTargetPower choice: -120,-118,...,-90 !\n",
-                 RC.config_file_name, i, rach_preambleInitialReceivedTargetPower);
+	      if ((rach_preambleInitialReceivedTargetPower<-120) || (rach_preambleInitialReceivedTargetPower>-90) || ((rach_preambleInitialReceivedTargetPower&1)!=0))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleInitialReceivedTargetPower choice: -120,-118,...,-90 !\n",
+			     RC.config_file_name, i, rach_preambleInitialReceivedTargetPower);
 
 
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_powerRampingStep= rach_powerRampingStep/2;
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_powerRampingStep= rach_powerRampingStep/2;
 
-          if ((rach_powerRampingStep<0) || (rach_powerRampingStep>6) || ((rach_powerRampingStep&1)!=0))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_powerRampingStep choice: 0,2,4,6 !\n",
-                 RC.config_file_name, i, rach_powerRampingStep);
+	      if ((rach_powerRampingStep<0) || (rach_powerRampingStep>6) || ((rach_powerRampingStep&1)!=0))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_powerRampingStep choice: 0,2,4,6 !\n",
+			     RC.config_file_name, i, rach_powerRampingStep);
 
 
 
-          switch (rach_preambleTransMax) {
+	      switch (rach_preambleTransMax) {
 #ifndef Rel14
-        _	      case 3:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n3;
-        break;
+		_	      case 3:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n3;
+		break;
 
-          case 4:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n4;
-        break;
+	      case 4:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n4;
+		break;
 
-          case 5:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n5;
-        break;
+	      case 5:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n5;
+		break;
 
-          case 6:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n6;
-        break;
+	      case 6:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n6;
+		break;
 
-          case 7:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n7;
-        break;
+	      case 7:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n7;
+		break;
 
-          case 8:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n8;
-        break;
+	      case 8:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n8;
+		break;
 
-          case 10:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n10;
-        break;
+	      case 10:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n10;
+		break;
 
-          case 20:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n20;
-        break;
+	      case 20:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n20;
+		break;
 
-          case 50:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n50;
-        break;
+	      case 50:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n50;
+		break;
 
-          case 100:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n100;
-        break;
+	      case 100:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n100;
+		break;
 
-          case 200:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n200;
-        break;
+	      case 200:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n200;
+		break;
 
 #else
 
-          case 3:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n3;
-        break;
+	      case 3:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n3;
+		break;
 
-          case 4:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n4;
-        break;
+	      case 4:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n4;
+		break;
 
-          case 5:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n5;
-        break;
+	      case 5:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n5;
+		break;
 
-          case 6:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n6;
-        break;
+	      case 6:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n6;
+		break;
 
-          case 7:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n7;
-        break;
+	      case 7:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n7;
+		break;
 
-          case 8:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n8;
-        break;
+	      case 8:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n8;
+		break;
 
-          case 10:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n10;
-        break;
+	      case 10:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n10;
+		break;
 
-          case 20:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n20;
-        break;
+	      case 20:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n20;
+		break;
 
-          case 50:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n50;
-        break;
+	      case 50:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n50;
+		break;
 
-          case 100:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n100;
-        break;
+	      case 100:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n100;
+		break;
 
-          case 200:
-        RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n200;
-        break;
+	      case 200:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax=  PreambleTransMax_n200;
+		break;
 #endif
 
-          default:
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleTransMax choice: 3,4,5,6,7,8,10,20,50,100,200!\n",
-                 RC.config_file_name, i, rach_preambleTransMax);
-        break;
-          }
-
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_raResponseWindowSize=  (rach_raResponseWindowSize==10)?7:rach_raResponseWindowSize-2;
-
-          if ((rach_raResponseWindowSize<0)||(rach_raResponseWindowSize==9)||(rach_raResponseWindowSize>10))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_raResponseWindowSize choice: 2,3,4,5,6,7,8,10!\n",
-                 RC.config_file_name, i, rach_preambleTransMax);
-
-
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_macContentionResolutionTimer= (rach_macContentionResolutionTimer/8)-1;
-
-          if ((rach_macContentionResolutionTimer<8) || (rach_macContentionResolutionTimer>64) || ((rach_macContentionResolutionTimer&7)!=0))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_macContentionResolutionTimer choice: 8,16,...,56,64!\n",
-                 RC.config_file_name, i, rach_preambleTransMax);
-
-          RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_maxHARQ_Msg3Tx= rach_maxHARQ_Msg3Tx;
-
-          if ((rach_maxHARQ_Msg3Tx<0) || (rach_maxHARQ_Msg3Tx>8))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_maxHARQ_Msg3Tx choice: 1..8!\n",
-                 RC.config_file_name, i, rach_preambleTransMax);
-
-
-          switch (pcch_defaultPagingCycle) {
-          case 32:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf32;
-              break;
-
-          case 64:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf64;
-              break;
-
-          case 128:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf128;
-              break;
-
-          case 256:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf256;
-              break;
-
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_defaultPagingCycle choice: 32,64,128,256!\n",
-                           RC.config_file_name, i, pcch_defaultPagingCycle);
-              break;
-          }
-
-          if (strcmp(pcch_nB, "fourT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_fourT;
-          }
-          else if (strcmp(pcch_nB, "twoT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_twoT;
-          }
-          else if (strcmp(pcch_nB, "oneT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneT;
-          }
-          else if (strcmp(pcch_nB, "halfT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_halfT;
-          }
-          else if (strcmp(pcch_nB, "quarterT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_quarterT;
-          }
-          else if (strcmp(pcch_nB, "oneEighthT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneEighthT;
-          }
-          else if (strcmp(pcch_nB, "oneSixteenthT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneSixteenthT;
-          }
-          else if (strcmp(pcch_nB, "oneThirtySecondT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneThirtySecondT;
-          }
-          else
-              AssertFatal(0,
-                          "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_nB choice: fourT,twoT,oneT,halfT,quarterT,oneighthT,oneSixteenthT,oneThirtySecondT !\n",
-                          RC.config_file_name, i, pcch_defaultPagingCycle);
-
-
-
-          switch (bcch_modificationPeriodCoeff) {
-          case 2:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n2;
-              break;
-
-          case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n4;
-              break;
-
-          case 8:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n8;
-              break;
-
-          case 16:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff= BCCH_Config__modificationPeriodCoeff_n16;
-              break;
-
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for bcch_modificationPeriodCoeff choice: 2,4,8,16",
-                           RC.config_file_name, i, bcch_modificationPeriodCoeff);
-
-              break;
-          }
-
-
-          switch (ue_TimersAndConstants_t300) {
-          case 100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms100;
-              break;
-
-          case 200:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms200;
-              break;
-
-          case 300:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms300;
-              break;
-
-          case 400:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms400;
-              break;
-
-          case 600:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms600;
-              break;
-
-          case 1000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms1000;
-              break;
-
-          case 1500:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms1500;
-              break;
-
-          case 2000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms2000;
-              break;
-
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t300 choice: 100,200,300,400,600,1000,1500,2000 ",
-                           RC.config_file_name, i, ue_TimersAndConstants_t300);
-              break;
-
-          }
-
-          switch (ue_TimersAndConstants_t301) {
-          case 100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms100;
-              break;
-
-          case 200:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms200;
-              break;
-
-          case 300:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms300;
-              break;
-
-          case 400:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms400;
-              break;
-
-          case 600:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms600;
-              break;
-
-          case 1000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1000;
-              break;
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleTransMax choice: 3,4,5,6,7,8,10,20,50,100,200!\n",
+			     RC.config_file_name, i, rach_preambleTransMax);
+		break;
+	      }
+
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_raResponseWindowSize=  (rach_raResponseWindowSize==10)?7:rach_raResponseWindowSize-2;
+
+	      if ((rach_raResponseWindowSize<0)||(rach_raResponseWindowSize==9)||(rach_raResponseWindowSize>10))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_raResponseWindowSize choice: 2,3,4,5,6,7,8,10!\n",
+			     RC.config_file_name, i, rach_preambleTransMax);
+
+
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_macContentionResolutionTimer= (rach_macContentionResolutionTimer/8)-1;
+
+	      if ((rach_macContentionResolutionTimer<8) || (rach_macContentionResolutionTimer>64) || ((rach_macContentionResolutionTimer&7)!=0))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_macContentionResolutionTimer choice: 8,16,...,56,64!\n",
+			     RC.config_file_name, i, rach_preambleTransMax);
+
+	      RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_maxHARQ_Msg3Tx= rach_maxHARQ_Msg3Tx;
+
+	      if ((rach_maxHARQ_Msg3Tx<0) || (rach_maxHARQ_Msg3Tx>8))
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_maxHARQ_Msg3Tx choice: 1..8!\n",
+			     RC.config_file_name, i, rach_preambleTransMax);
+
+
+	      switch (pcch_defaultPagingCycle) {
+	      case 32:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf32;
+		break;
+
+	      case 64:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf64;
+		break;
+
+	      case 128:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf128;
+		break;
+
+	      case 256:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf256;
+		break;
+
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_defaultPagingCycle choice: 32,64,128,256!\n",
+			     RC.config_file_name, i, pcch_defaultPagingCycle);
+		break;
+	      }
+
+	      if (strcmp(pcch_nB, "fourT") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_fourT;
+	      }
+	      else if (strcmp(pcch_nB, "twoT") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_twoT;
+	      }
+	      else if (strcmp(pcch_nB, "oneT") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneT;
+	      }
+	      else if (strcmp(pcch_nB, "halfT") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_halfT;
+	      }
+	      else if (strcmp(pcch_nB, "quarterT") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_quarterT;
+	      }
+	      else if (strcmp(pcch_nB, "oneEighthT") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneEighthT;
+	      }
+	      else if (strcmp(pcch_nB, "oneSixteenthT") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneSixteenthT;
+	      }
+	      else if (strcmp(pcch_nB, "oneThirtySecondT") == 0) {
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pcch_nB = PCCH_Config__nB_oneThirtySecondT;
+	      }
+	      else
+		AssertFatal(0,
+			    "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_nB choice: fourT,twoT,oneT,halfT,quarterT,oneighthT,oneSixteenthT,oneThirtySecondT !\n",
+			    RC.config_file_name, i, pcch_defaultPagingCycle);
+
+
+
+	      switch (bcch_modificationPeriodCoeff) {
+	      case 2:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n2;
+		break;
+
+	      case 4:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n4;
+		break;
+
+	      case 8:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n8;
+		break;
+
+	      case 16:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].bcch_modificationPeriodCoeff= BCCH_Config__modificationPeriodCoeff_n16;
+		break;
+
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for bcch_modificationPeriodCoeff choice: 2,4,8,16",
+			     RC.config_file_name, i, bcch_modificationPeriodCoeff);
+
+		break;
+	      }
+
+
+	      switch (ue_TimersAndConstants_t300) {
+	      case 100:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms100;
+		break;
+
+	      case 200:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms200;
+		break;
+
+	      case 300:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms300;
+		break;
+
+	      case 400:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms400;
+		break;
+
+	      case 600:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms600;
+		break;
+
+	      case 1000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms1000;
+		break;
+
+	      case 1500:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms1500;
+		break;
+
+	      case 2000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t300= UE_TimersAndConstants__t300_ms2000;
+		break;
+
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t300 choice: 100,200,300,400,600,1000,1500,2000 ",
+			     RC.config_file_name, i, ue_TimersAndConstants_t300);
+		break;
+
+	      }
+
+	      switch (ue_TimersAndConstants_t301) {
+	      case 100:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms100;
+		break;
+
+	      case 200:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms200;
+		break;
+
+	      case 300:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms300;
+		break;
+
+	      case 400:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms400;
+		break;
+
+	      case 600:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms600;
+		break;
+
+	      case 1000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1000;
+		break;
 
-          case 1500:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1500;
-              break;
+	      case 1500:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1500;
+		break;
 
-          case 2000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms2000;
-              break;
+	      case 2000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms2000;
+		break;
 
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t301 choice: 100,200,300,400,600,1000,1500,2000 ",
-                           RC.config_file_name, i, ue_TimersAndConstants_t301);
-              break;
-
-          }
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t301 choice: 100,200,300,400,600,1000,1500,2000 ",
+			     RC.config_file_name, i, ue_TimersAndConstants_t301);
+		break;
+
+	      }
 
-          switch (ue_TimersAndConstants_t310) {
-          case 0:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms0;
-              break;
+	      switch (ue_TimersAndConstants_t310) {
+	      case 0:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms0;
+		break;
 
-          case 50:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms50;
-              break;
+	      case 50:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms50;
+		break;
 
-          case 100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms100;
-              break;
+	      case 100:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms100;
+		break;
 
-          case 200:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms200;
-              break;
+	      case 200:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms200;
+		break;
 
-          case 500:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms500;
-              break;
-
-          case 1000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms1000;
-              break;
-
-          case 2000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms2000;
-              break;
-
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t310 choice: 0,50,100,200,500,1000,1500,2000 ",
-                           RC.config_file_name, i, ue_TimersAndConstants_t310);
-              break;
-
-          }
-
-          switch (ue_TimersAndConstants_t311) {
-          case 1000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms1000;
-              break;
-
-          case 3110:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms3000;
-              break;
-
-          case 5000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms5000;
-              break;
-
-          case 10000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms10000;
-              break;
-
-          case 15000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms15000;
-              break;
-
-          case 20000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms20000;
-              break;
-
-          case 31100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms30000;
-              break;
-
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1000,3000,5000,10000,150000,20000,30000",
-                           RC.config_file_name, i, ue_TimersAndConstants_t311);
-              break;
-
-          }
-
-          switch (ue_TimersAndConstants_n310) {
-          case 1:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n1;
-              break;
-
-          case 2:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n2;
-              break;
-
-          case 3:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n3;
-              break;
-
-          case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n4;
-              break;
-
-          case 6:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n6;
-              break;
-
-          case 8:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n8;
-              break;
-
-          case 10:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n10;
-              break;
-
-          case 20:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n20;
-              break;
-
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_n310 choice: 1,2,3,4,6,6,8,10,20",
-                           RC.config_file_name, i, ue_TimersAndConstants_n311);
-              break;
-
-          }
-
-          switch (ue_TimersAndConstants_n311) {
-          case 1:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n1;
-              break;
-
-          case 2:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n2;
-              break;
-
-          case 3:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n3;
-              break;
-
-          case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n4;
-              break;
-
-          case 5:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n5;
-              break;
-
-          case 6:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n6;
-              break;
-
-          case 8:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n8;
-              break;
-
-          case 10:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n10;
-              break;
-
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1,2,3,4,5,6,8,10",
-                           RC.config_file_name, i, ue_TimersAndConstants_t311);
-              break;
-
-          }
-
-          switch (ue_TransmissionMode) {
-          case 1:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm1;
-              break;
-          case 2:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm2;
-              break;
-          case 3:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm3;
-              break;
-          case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm4;
-              break;
-          case 5:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm5;
-              break;
-          case 6:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm6;
-              break;
-          case 7:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm7;
-              break;
-          default:
-              AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TransmissionMode choice: 1,2,3,4,5,6,7",
-                           RC.config_file_name, i, ue_TransmissionMode);
-              break;
-          }
+	      case 500:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms500;
+		break;
+
+	      case 1000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms1000;
+		break;
+
+	      case 2000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms2000;
+		break;
+
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t310 choice: 0,50,100,200,500,1000,1500,2000 ",
+			     RC.config_file_name, i, ue_TimersAndConstants_t310);
+		break;
+
+	      }
+
+	      switch (ue_TimersAndConstants_t311) {
+	      case 1000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms1000;
+		break;
+
+	      case 3110:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms3000;
+		break;
+
+	      case 5000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms5000;
+		break;
+
+	      case 10000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms10000;
+		break;
+
+	      case 15000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms15000;
+		break;
+
+	      case 20000:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms20000;
+		break;
+
+	      case 31100:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms30000;
+		break;
+
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1000,3000,5000,10000,150000,20000,30000",
+			     RC.config_file_name, i, ue_TimersAndConstants_t311);
+		break;
+
+	      }
+
+	      switch (ue_TimersAndConstants_n310) {
+	      case 1:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n1;
+		break;
+
+	      case 2:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n2;
+		break;
+
+	      case 3:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n3;
+		break;
+
+	      case 4:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n4;
+		break;
+
+	      case 6:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n6;
+		break;
+
+	      case 8:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n8;
+		break;
+
+	      case 10:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n10;
+		break;
+
+	      case 20:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n20;
+		break;
+
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_n310 choice: 1,2,3,4,6,6,8,10,20",
+			     RC.config_file_name, i, ue_TimersAndConstants_n311);
+		break;
+
+	      }
+
+	      switch (ue_TimersAndConstants_n311) {
+	      case 1:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n1;
+		break;
+
+	      case 2:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n2;
+		break;
+
+	      case 3:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n3;
+		break;
+
+	      case 4:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n4;
+		break;
+
+	      case 5:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n5;
+		break;
+
+	      case 6:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n6;
+		break;
+
+	      case 8:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n8;
+		break;
+
+	      case 10:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n10;
+		break;
+
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1,2,3,4,5,6,8,10",
+			     RC.config_file_name, i, ue_TimersAndConstants_t311);
+		break;
+
+	      }
+
+	      switch (ue_TransmissionMode) {
+	      case 1:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm1;
+		break;
+	      case 2:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm2;
+		break;
+	      case 3:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm3;
+		break;
+	      case 4:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm4;
+		break;
+	      case 5:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm5;
+		break;
+	      case 6:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm6;
+		break;
+	      case 7:
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm7;
+		break;
+	      default:
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TransmissionMode choice: 1,2,3,4,5,6,7",
+			     RC.config_file_name, i, ue_TransmissionMode);
+		break;
+	      }
 #ifdef Rel14
-          setting_br13 = config_setting_get_member(component_carrier, ENB_CONFIG_STRING_BR);
-          if (setting_br13 == NULL) {
-              puts("setting BR is NULL");
-          } else {
-              puts("setting BR is NOT NULL");
-          }
+	      setting_br13 = config_setting_get_member(component_carrier, ENB_CONFIG_STRING_BR);
+	      if (setting_br13 == NULL) {
+		puts("setting BR is NULL");
+	      } else {
+		puts("setting BR is NOT NULL");
+	      }
 
-          if (setting_br13 != NULL) {
+	      if (setting_br13 != NULL) {
 
-              scheduling_info_br_list       = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_SCHEDULING_INFO_LIST);
-              int num_scheduling_info       = config_setting_length(scheduling_info_br_list);
-              RRC_CONFIGURATION_REQ (msg_p).scheduling_info_br_size[j] = num_scheduling_info;
+		scheduling_info_br_list       = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_SCHEDULING_INFO_LIST);
+		int num_scheduling_info       = config_setting_length(scheduling_info_br_list);
+		RRC_CONFIGURATION_REQ (msg_p).scheduling_info_br_size[j] = num_scheduling_info;
 
-              for (sched_info_idx = 0; sched_info_idx < num_scheduling_info; ++sched_info_idx)
-              {
-                  scheduling_info_br = config_setting_get_elem(scheduling_info_br_list, sched_info_idx);
-                  if (! config_setting_lookup_int(scheduling_info_br, ENB_CONFIG_STRING_SI_NARROWBAND_R13, &si_Narrowband_r13)
-                     && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_TBS_R13, &si_TBS_r13)
-                  )
-                  {
-                      AssertFatal (0, "Failed to parse eNB configuration file %s, scheduking info br %d!\n", RC.config_file_name, nb_cc++);
-                  }
-                  RRC_CONFIGURATION_REQ (msg_p).si_Narrowband_r13[j][sched_info_idx] = si_Narrowband_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).si_TBS_r13[j][sched_info_idx] = si_TBS_r13;
-              }
+		for (sched_info_idx = 0; sched_info_idx < num_scheduling_info; ++sched_info_idx)
+		  {
+		    scheduling_info_br = config_setting_get_elem(scheduling_info_br_list, sched_info_idx);
+		    if (! config_setting_lookup_int(scheduling_info_br, ENB_CONFIG_STRING_SI_NARROWBAND_R13, &si_Narrowband_r13)
+			&& config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_TBS_R13, &si_TBS_r13)
+			)
+		      {
+			AssertFatal (0, "Failed to parse eNB configuration file %s, scheduking info br %d!\n", RC.config_file_name, nb_cc++);
+		      }
+		    RRC_CONFIGURATION_REQ (msg_p).si_Narrowband_r13[j][sched_info_idx] = si_Narrowband_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).si_TBS_r13[j][sched_info_idx] = si_TBS_r13;
+		  }
 
-              system_info_value_tag_SI_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_LIST);
-              int num_system_info = config_setting_length(system_info_value_tag_SI_list);
-              RRC_CONFIGURATION_REQ (msg_p).system_info_value_tag_SI_size[j] = num_system_info;
+		system_info_value_tag_SI_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_LIST);
+		int num_system_info = config_setting_length(system_info_value_tag_SI_list);
+		RRC_CONFIGURATION_REQ (msg_p).system_info_value_tag_SI_size[j] = num_system_info;
 
-              for (sys_info_idx = 0; sys_info_idx < num_system_info; ++sys_info_idx)
-              {
-                  system_info_value_tag_SI = config_setting_get_elem(system_info_value_tag_SI_list, sys_info_idx);
-                  if ( !(config_setting_lookup_int(system_info_value_tag_SI, ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_SI_R13, &systemInfoValueTagSi_r13)) )
-                  {
-                      AssertFatal (0, "Failed to parse eNB configuration file %s, system info value tag %d!\n", RC.config_file_name, nb_cc++);
-                  }
-                  RRC_CONFIGURATION_REQ (msg_p).systemInfoValueTagSi_r13[j][sys_info_idx] = systemInfoValueTagSi_r13;
-              }
+		for (sys_info_idx = 0; sys_info_idx < num_system_info; ++sys_info_idx)
+		  {
+		    system_info_value_tag_SI = config_setting_get_elem(system_info_value_tag_SI_list, sys_info_idx);
+		    if ( !(config_setting_lookup_int(system_info_value_tag_SI, ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_SI_R13, &systemInfoValueTagSi_r13)) )
+		      {
+			AssertFatal (0, "Failed to parse eNB configuration file %s, system info value tag %d!\n", RC.config_file_name, nb_cc++);
+		      }
+		    RRC_CONFIGURATION_REQ (msg_p).systemInfoValueTagSi_r13[j][sys_info_idx] = systemInfoValueTagSi_r13;
+		  }
 
 
-              rach_ce_level_info_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_RACH_CE_LEVEL_INFO_LIST);
-              int num_rach_ce_level_info_list = config_setting_length(rach_ce_level_info_r13_list);
-              RRC_CONFIGURATION_REQ (msg_p).rach_CE_LevelInfoList_r13_size[j] = num_rach_ce_level_info_list;
-              int rach_info_level_idx;
-              for (rach_info_level_idx = 0; rach_info_level_idx < num_rach_ce_level_info_list; ++rach_info_level_idx)
-              {
-                  rach_ce_level_info_r13 = config_setting_get_elem(rach_ce_level_info_r13_list, rach_info_level_idx);
-                  if (!     (config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_FIRST_PREAMBLE,                   &firstPreamble_r13)
-                          && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_LAST_PREAMBLE,                    &lastPreamble_r13)
-                          && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_RA_RESPONSE_WINDOW_SIZE_R13,      &ra_ResponseWindowSize_r13)
-                          && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_MAC_CONTENT_RESOLUTION_TIMER_R13, &mac_ContentionResolutionTimer_r13)
-                          && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_RAR_HOPPING_CONFIG_R13,           &rar_HoppingConfig_r13) )
-                          )
-                  {
-                      AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, rach_ce_level_info_r13 %d!\n",
-                           RC.config_file_name, nb_cc++);
-                  }
+		rach_ce_level_info_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_RACH_CE_LEVEL_INFO_LIST);
+		int num_rach_ce_level_info_list = config_setting_length(rach_ce_level_info_r13_list);
+		RRC_CONFIGURATION_REQ (msg_p).rach_CE_LevelInfoList_r13_size[j] = num_rach_ce_level_info_list;
+		int rach_info_level_idx;
+		for (rach_info_level_idx = 0; rach_info_level_idx < num_rach_ce_level_info_list; ++rach_info_level_idx)
+		  {
+		    rach_ce_level_info_r13 = config_setting_get_elem(rach_ce_level_info_r13_list, rach_info_level_idx);
+		    if (!     (config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_FIRST_PREAMBLE,                   &firstPreamble_r13)
+			       && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_LAST_PREAMBLE,                    &lastPreamble_r13)
+			       && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_RA_RESPONSE_WINDOW_SIZE_R13,      &ra_ResponseWindowSize_r13)
+			       && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_MAC_CONTENT_RESOLUTION_TIMER_R13, &mac_ContentionResolutionTimer_r13)
+			       && config_setting_lookup_int(rach_ce_level_info_r13, ENB_CONFIG_STRING_RAR_HOPPING_CONFIG_R13,           &rar_HoppingConfig_r13) )
+			)
+		      {
+			AssertFatal (0,
+				     "Failed to parse eNB configuration file %s, rach_ce_level_info_r13 %d!\n",
+				     RC.config_file_name, nb_cc++);
+		      }
 
-                  RRC_CONFIGURATION_REQ (msg_p).firstPreamble_r13[j][rach_info_level_idx]                 = firstPreamble_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).lastPreamble_r13[j][rach_info_level_idx]                  = lastPreamble_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).ra_ResponseWindowSize_r13[j][rach_info_level_idx]         = ra_ResponseWindowSize_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).mac_ContentionResolutionTimer_r13[j][rach_info_level_idx] = mac_ContentionResolutionTimer_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).rar_HoppingConfig_r13[j][rach_info_level_idx]             = rar_HoppingConfig_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).firstPreamble_r13[j][rach_info_level_idx]                 = firstPreamble_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).lastPreamble_r13[j][rach_info_level_idx]                  = lastPreamble_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).ra_ResponseWindowSize_r13[j][rach_info_level_idx]         = ra_ResponseWindowSize_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).mac_ContentionResolutionTimer_r13[j][rach_info_level_idx] = mac_ContentionResolutionTimer_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).rar_HoppingConfig_r13[j][rach_info_level_idx]             = rar_HoppingConfig_r13;
 
-              }
+		  }
 
-              rsrp_range_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_RSRP_RANGE_LIST);
-              int num_rsrp_list = config_setting_length(rsrp_range_list);
-              RRC_CONFIGURATION_REQ (msg_p).rsrp_range_list_size[j] = num_rsrp_list;
-              int rsrp_range_idx;
-              for (rsrp_range_idx = 0; rsrp_range_idx < num_rsrp_list; ++rsrp_range_idx)
-              {
-                  rsrp_range_member = config_setting_get_elem(rsrp_range_list, rsrp_range_idx);
-                  if (!(config_setting_lookup_int(rsrp_range_member, ENB_CONFIG_STRING_RSRP_RANGE_BR, &rsrp_range_br)))
-                  {
-                      AssertFatal (0,
-                                   "Failed to parse eNB configuration file %s, rsrp_range %d!\n",
-                                   RC.config_file_name, nb_cc++);
-                  }
-                  RRC_CONFIGURATION_REQ (msg_p).rsrp_range[j][rsrp_range_idx] = rsrp_range_br;
-              }
+		rsrp_range_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_RSRP_RANGE_LIST);
+		int num_rsrp_list = config_setting_length(rsrp_range_list);
+		RRC_CONFIGURATION_REQ (msg_p).rsrp_range_list_size[j] = num_rsrp_list;
+		int rsrp_range_idx;
+		for (rsrp_range_idx = 0; rsrp_range_idx < num_rsrp_list; ++rsrp_range_idx)
+		  {
+		    rsrp_range_member = config_setting_get_elem(rsrp_range_list, rsrp_range_idx);
+		    if (!(config_setting_lookup_int(rsrp_range_member, ENB_CONFIG_STRING_RSRP_RANGE_BR, &rsrp_range_br)))
+		      {
+			AssertFatal (0,
+				     "Failed to parse eNB configuration file %s, rsrp_range %d!\n",
+				     RC.config_file_name, nb_cc++);
+		      }
+		    RRC_CONFIGURATION_REQ (msg_p).rsrp_range[j][rsrp_range_idx] = rsrp_range_br;
+		  }
 
-              prach_parameters_ce_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_PRACH_PARAMETERS_CE_R13);
-              int num_prach_parameters_ce_r13 = config_setting_length(prach_parameters_ce_r13_list);
-              RRC_CONFIGURATION_REQ (msg_p).prach_parameters_list_size[j] = num_prach_parameters_ce_r13;
-              int prach_parameters_index;
-              for (prach_parameters_index = 0; prach_parameters_index < num_prach_parameters_ce_r13; ++prach_parameters_index)
-              {
-                  prach_parameters_ce_r13 = config_setting_get_elem(prach_parameters_ce_r13_list, prach_parameters_index);
-                  if (!     (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX_BR, &prach_config_index_br)
-                          && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET_BR, &prach_freq_offset_br)
-                          && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_NUM_REPETITION_PREAMBLE_ATTEMPT_R13, &numRepetitionPerPreambleAttempt_r13)
-                          && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_MPDCCH_NUM_REPETITION_RA_R13, &mpdcch_NumRepetition_RA_r13)
-                          && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_HOPPING_CONFIG_R13, &prach_HoppingConfig_r13) )
-                          )
-                  {
-                      AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, prach_parameters_ce_r13_list %d!\n",
-                           RC.config_file_name, nb_cc++);
-                  }
+		prach_parameters_ce_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_PRACH_PARAMETERS_CE_R13);
+		int num_prach_parameters_ce_r13 = config_setting_length(prach_parameters_ce_r13_list);
+		RRC_CONFIGURATION_REQ (msg_p).prach_parameters_list_size[j] = num_prach_parameters_ce_r13;
+		int prach_parameters_index;
+		for (prach_parameters_index = 0; prach_parameters_index < num_prach_parameters_ce_r13; ++prach_parameters_index)
+		  {
+		    prach_parameters_ce_r13 = config_setting_get_elem(prach_parameters_ce_r13_list, prach_parameters_index);
+		    if (!     (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX_BR, &prach_config_index_br)
+			       && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET_BR, &prach_freq_offset_br)
+			       && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_NUM_REPETITION_PREAMBLE_ATTEMPT_R13, &numRepetitionPerPreambleAttempt_r13)
+			       && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_MPDCCH_NUM_REPETITION_RA_R13, &mpdcch_NumRepetition_RA_r13)
+			       && config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_HOPPING_CONFIG_R13, &prach_HoppingConfig_r13) )
+			)
+		      {
+			AssertFatal (0,
+				     "Failed to parse eNB configuration file %s, prach_parameters_ce_r13_list %d!\n",
+				     RC.config_file_name, nb_cc++);
+		      }
 
-                  RRC_CONFIGURATION_REQ (msg_p).prach_config_index[j][prach_parameters_index]                  = prach_config_index_br;
-                  RRC_CONFIGURATION_REQ (msg_p).prach_freq_offset[j][prach_parameters_index]                   = prach_freq_offset_br;
-                  RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index]          = prach_StartingSubframe_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index]         = maxNumPreambleAttemptCE_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).numRepetitionPerPreambleAttempt_r13[j][prach_parameters_index] = numRepetitionPerPreambleAttempt_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).mpdcch_NumRepetition_RA_r13[j][prach_parameters_index]         = mpdcch_NumRepetition_RA_r13;
-                  RRC_CONFIGURATION_REQ (msg_p).prach_HoppingConfig_r13[j][prach_parameters_index]             = prach_HoppingConfig_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).prach_config_index[j][prach_parameters_index]                  = prach_config_index_br;
+		    RRC_CONFIGURATION_REQ (msg_p).prach_freq_offset[j][prach_parameters_index]                   = prach_freq_offset_br;
+		    RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index]          = prach_StartingSubframe_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index]         = maxNumPreambleAttemptCE_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).numRepetitionPerPreambleAttempt_r13[j][prach_parameters_index] = numRepetitionPerPreambleAttempt_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).mpdcch_NumRepetition_RA_r13[j][prach_parameters_index]         = mpdcch_NumRepetition_RA_r13;
+		    RRC_CONFIGURATION_REQ (msg_p).prach_HoppingConfig_r13[j][prach_parameters_index]             = prach_HoppingConfig_r13;
 
-                  if (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_STARTING_SUBFRAME_R13, &prach_StartingSubframe_r13))
-                  {
-                      RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = calloc(1, sizeof(long));
-                      RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = prach_StartingSubframe_r13;
-                  }
-                  else
-                  {
-                      RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = NULL;
-                  }
+		    if (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_PRACH_STARTING_SUBFRAME_R13, &prach_StartingSubframe_r13))
+		      {
+			RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = calloc(1, sizeof(long));
+			RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = prach_StartingSubframe_r13;
+		      }
+		    else
+		      {
+			RRC_CONFIGURATION_REQ (msg_p).prach_StartingSubframe_r13[j][prach_parameters_index] = NULL;
+		      }
 
-                  if (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_MAX_NUM_PREAMBLE_ATTEMPT_CE_R13, &maxNumPreambleAttemptCE_r13))
-                  {
-                      RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = calloc(1, sizeof(long));
-                      RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = maxNumPreambleAttemptCE_r13;
-                  }
-                  else
-                  {
-                      RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = NULL;
-                  }
+		    if (config_setting_lookup_int(prach_parameters_ce_r13, ENB_CONFIG_STRING_MAX_NUM_PREAMBLE_ATTEMPT_CE_R13, &maxNumPreambleAttemptCE_r13))
+		      {
+			RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = calloc(1, sizeof(long));
+			RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = maxNumPreambleAttemptCE_r13;
+		      }
+		    else
+		      {
+			RRC_CONFIGURATION_REQ (msg_p).maxNumPreambleAttemptCE_r13[j][prach_parameters_index] = NULL;
+		      }
 
-              }
+		  }
 
 
-              // TODO
-//              max_available_narrow_band = config_setting_get_member(prach_parameters_ce_r13, ENB_CONFIG_STRING_MAX_AVAILABLE_NARROW_BAND);
+		// TODO
+		//              max_available_narrow_band = config_setting_get_member(prach_parameters_ce_r13, ENB_CONFIG_STRING_MAX_AVAILABLE_NARROW_BAND);
 
 
-              n1_pucch_AN_info_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_N1_PUCCH_AN_INFO_LIST);
+		n1_pucch_AN_info_r13_list = config_setting_get_member(setting_br13, ENB_CONFIG_STRING_N1_PUCCH_AN_INFO_LIST);
 
-              int num_pucch_an_info = config_setting_length(n1_pucch_AN_info_r13_list);
-              RRC_CONFIGURATION_REQ (msg_p).pucch_info_value_size[j] = num_pucch_an_info;
-              int pucch_info_idx;
-              for (pucch_info_idx = 0; pucch_info_idx < num_pucch_an_info; ++pucch_info_idx)
-              {
-                  n1_pucch_AN_info_r13 = config_setting_get_elem(n1_pucch_AN_info_r13_list, pucch_info_idx);
-                  if (! (config_setting_lookup_int(n1_pucch_AN_info_r13, ENB_CONFIG_STRING_PUCCH_INFO_VALUE, &pucch_info_value)) )
-                  {
-                      AssertFatal (0,
-                           "Failed to parse eNB configuration file %s, n1_pucch_AN_info_list_r13_list %d!\n",
-                           RC.config_file_name, nb_cc++);
-                  }
+		int num_pucch_an_info = config_setting_length(n1_pucch_AN_info_r13_list);
+		RRC_CONFIGURATION_REQ (msg_p).pucch_info_value_size[j] = num_pucch_an_info;
+		int pucch_info_idx;
+		for (pucch_info_idx = 0; pucch_info_idx < num_pucch_an_info; ++pucch_info_idx)
+		  {
+		    n1_pucch_AN_info_r13 = config_setting_get_elem(n1_pucch_AN_info_r13_list, pucch_info_idx);
+		    if (! (config_setting_lookup_int(n1_pucch_AN_info_r13, ENB_CONFIG_STRING_PUCCH_INFO_VALUE, &pucch_info_value)) )
+		      {
+			AssertFatal (0,
+				     "Failed to parse eNB configuration file %s, n1_pucch_AN_info_list_r13_list %d!\n",
+				     RC.config_file_name, nb_cc++);
+		      }
 
-                  RRC_CONFIGURATION_REQ (msg_p).pucch_info_value[j][pucch_info_idx] = pucch_info_value;
-              }
+		    RRC_CONFIGURATION_REQ (msg_p).pucch_info_value[j][pucch_info_idx] = pucch_info_value;
+		  }
 
-        // Rel8 RadioResourceConfigCommon Parameters
-        if (!(config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
+		// Rel8 RadioResourceConfigCommon Parameters
+		if (!(config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FRAME_TYPE, &frame_type)
 
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_ROOT, &prach_root)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX, &prach_config_index)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PRACH_HIGH_SPEED, &prach_high_speed)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_ZERO_CORRELATION, &prach_zero_correlation)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET, &prach_freq_offset)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTA_SHIFT, &pucch_delta_shift)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_NRB_CQI, &pucch_nRB_CQI)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_NCS_AN, &pucch_nCS_AN)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_ROOT, &prach_root)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_CONFIG_INDEX, &prach_config_index)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PRACH_HIGH_SPEED, &prach_high_speed)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_ZERO_CORRELATION, &prach_zero_correlation)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_FREQ_OFFSET, &prach_freq_offset)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTA_SHIFT, &pucch_delta_shift)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_NRB_CQI, &pucch_nRB_CQI)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_NCS_AN, &pucch_nCS_AN)
 #if !defined(Rel10) && !defined(Rel14)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_N1_AN, &pucch_n1_AN)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_N1_AN, &pucch_n1_AN)
 #endif
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PDSCH_RS_EPRE, &pdsch_referenceSignalPower)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PDSCH_PB, &pdsch_p_b)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_N_SB, &pusch_n_SB)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE, &pusch_hoppingMode)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_HOPPINGOFFSET, &pusch_hoppingOffset)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM, &pusch_enable64QAM)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN, &pusch_groupHoppingEnabled)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_GROUP_ASSIGNMENT, &pusch_groupAssignment)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN, &pusch_sequenceHoppingEnabled)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_NDMRS1, &pusch_nDMRS1)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PHICH_DURATION, &phich_duration)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PHICH_RESOURCE, &phich_resource)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_ENABLE, &srs_enable)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_PO_NOMINAL, &pusch_p0_Nominal)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_ALPHA, &pusch_alpha)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, &pucch_p0_Nominal)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, &msg3_delta_Preamble)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, &pucch_deltaF_Format1)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, &pucch_deltaF_Format1b)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, &pucch_deltaF_Format2)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, &pucch_deltaF_Format2a)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, &pucch_deltaF_Format2b)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, &rach_numberOfRA_Preambles)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, &rach_preamblesGroupAConfig)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_POWERRAMPINGSTEP, &rach_powerRampingStep)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER, &rach_preambleInitialReceivedTargetPower)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLETRANSMAX, &rach_preambleTransMax)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, &rach_raResponseWindowSize)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, &rach_macContentionResolutionTimer)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &rach_maxHARQ_Msg3Tx)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE,  &pcch_defaultPagingCycle)
-              && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PCCH_NB,  &pcch_nB)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF,  &bcch_modificationPeriodCoeff)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T300,  &ue_TimersAndConstants_t300)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T301,  &ue_TimersAndConstants_t301)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T310,  &ue_TimersAndConstants_t310)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T311,  &ue_TimersAndConstants_t311)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_N310,  &ue_TimersAndConstants_n310)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_N311,  &ue_TimersAndConstants_n311)
-              && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UE_TRANSMISSION_MODE,  &ue_TransmissionMode)
-              )) {
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, Component Carrier %d!\n",
-                   RC.config_file_name, nb_cc++);
-              continue; // FIXME this prevents segfaults below, not sure what happens after function exit
-            }
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PDSCH_RS_EPRE, &pdsch_referenceSignalPower)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PDSCH_PB, &pdsch_p_b)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_N_SB, &pusch_n_SB)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE, &pusch_hoppingMode)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_HOPPINGOFFSET, &pusch_hoppingOffset)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM, &pusch_enable64QAM)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN, &pusch_groupHoppingEnabled)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_GROUP_ASSIGNMENT, &pusch_groupAssignment)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN, &pusch_sequenceHoppingEnabled)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_NDMRS1, &pusch_nDMRS1)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PHICH_DURATION, &phich_duration)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PHICH_RESOURCE, &phich_resource)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_ENABLE, &srs_enable)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUSCH_PO_NOMINAL, &pusch_p0_Nominal)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUSCH_ALPHA, &pusch_alpha)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, &pucch_p0_Nominal)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, &msg3_delta_Preamble)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, &pucch_deltaF_Format1)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, &pucch_deltaF_Format1b)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, &pucch_deltaF_Format2)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, &pucch_deltaF_Format2a)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, &pucch_deltaF_Format2b)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, &rach_numberOfRA_Preambles)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, &rach_preamblesGroupAConfig)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_POWERRAMPINGSTEP, &rach_powerRampingStep)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER, &rach_preambleInitialReceivedTargetPower)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_PREAMBLETRANSMAX, &rach_preambleTransMax)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, &rach_raResponseWindowSize)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, &rach_macContentionResolutionTimer)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, &rach_maxHARQ_Msg3Tx)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE,  &pcch_defaultPagingCycle)
+		      && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PCCH_NB,  &pcch_nB)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF,  &bcch_modificationPeriodCoeff)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T300,  &ue_TimersAndConstants_t300)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T301,  &ue_TimersAndConstants_t301)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T310,  &ue_TimersAndConstants_t310)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_T311,  &ue_TimersAndConstants_t311)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_N310,  &ue_TimersAndConstants_n310)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UETIMERS_N311,  &ue_TimersAndConstants_n311)
+		      && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_UE_TRANSMISSION_MODE,  &ue_TransmissionMode)
+		      )) {
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, Component Carrier %d!\n",
+			       RC.config_file_name, nb_cc++);
+		  continue; // FIXME this prevents segfaults below, not sure what happens after function exit
+		}
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_root =  prach_root;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_root =  prach_root;
 
-            if ((prach_root <0) || (prach_root > 1023))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_root choice: 0..1023 !\n",
-                   RC.config_file_name, i, prach_root);
+		if ((prach_root <0) || (prach_root > 1023))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_root choice: 0..1023 !\n",
+			       RC.config_file_name, i, prach_root);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_config_index = prach_config_index;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_config_index = prach_config_index;
 
-            if ((prach_config_index <0) || (prach_config_index > 63))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_config_index choice: 0..1023 !\n",
-                   RC.config_file_name, i, prach_config_index);
+		if ((prach_config_index <0) || (prach_config_index > 63))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_config_index choice: 0..1023 !\n",
+			       RC.config_file_name, i, prach_config_index);
 
-            if (!prach_high_speed)
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-                   RC.config_file_name, i, ENB_CONFIG_STRING_PRACH_HIGH_SPEED);
-            else if (strcmp(prach_high_speed, "ENABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_high_speed = TRUE;
-            }
-            else if (strcmp(prach_high_speed, "DISABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_high_speed = FALSE;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prach_config choice: ENABLE,DISABLE !\n",
-                  RC.config_file_name, i, prach_high_speed);
+		if (!prach_high_speed)
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+			       RC.config_file_name, i, ENB_CONFIG_STRING_PRACH_HIGH_SPEED);
+		else if (strcmp(prach_high_speed, "ENABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_high_speed = TRUE;
+		}
+		else if (strcmp(prach_high_speed, "DISABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_high_speed = FALSE;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prach_config choice: ENABLE,DISABLE !\n",
+			      RC.config_file_name, i, prach_high_speed);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_zero_correlation =prach_zero_correlation;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_zero_correlation =prach_zero_correlation;
 
-            if ((prach_zero_correlation <0) || (prach_zero_correlation > 15))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_zero_correlation choice: 0..15!\n",
-                   RC.config_file_name, i, prach_zero_correlation);
+		if ((prach_zero_correlation <0) || (prach_zero_correlation > 15))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_zero_correlation choice: 0..15!\n",
+			       RC.config_file_name, i, prach_zero_correlation);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_freq_offset = prach_freq_offset;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].prach_freq_offset = prach_freq_offset;
 
-            if ((prach_freq_offset <0) || (prach_freq_offset > 94))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_freq_offset choice: 0..94!\n",
-                   RC.config_file_name, i, prach_freq_offset);
+		if ((prach_freq_offset <0) || (prach_freq_offset > 94))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for prach_freq_offset choice: 0..94!\n",
+			       RC.config_file_name, i, prach_freq_offset);
 
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_delta_shift = pucch_delta_shift-1;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_delta_shift = pucch_delta_shift-1;
 
-            if ((pucch_delta_shift <1) || (pucch_delta_shift > 3))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_delta_shift choice: 1..3!\n",
-                   RC.config_file_name, i, pucch_delta_shift);
+		if ((pucch_delta_shift <1) || (pucch_delta_shift > 3))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_delta_shift choice: 1..3!\n",
+			       RC.config_file_name, i, pucch_delta_shift);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_nRB_CQI = pucch_nRB_CQI;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_nRB_CQI = pucch_nRB_CQI;
 
-            if ((pucch_nRB_CQI <0) || (pucch_nRB_CQI > 98))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nRB_CQI choice: 0..98!\n",
-                   RC.config_file_name, i, pucch_nRB_CQI);
+		if ((pucch_nRB_CQI <0) || (pucch_nRB_CQI > 98))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nRB_CQI choice: 0..98!\n",
+			       RC.config_file_name, i, pucch_nRB_CQI);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_nCS_AN = pucch_nCS_AN;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_nCS_AN = pucch_nCS_AN;
 
-            if ((pucch_nCS_AN <0) || (pucch_nCS_AN > 7))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
-                   RC.config_file_name, i, pucch_nCS_AN);
+		if ((pucch_nCS_AN <0) || (pucch_nCS_AN > 7))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
+			       RC.config_file_name, i, pucch_nCS_AN);
 
 #if !defined(Rel10) && !defined(Rel14)
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_n1_AN = pucch_n1_AN;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pucch_n1_AN = pucch_n1_AN;
 
-            if ((pucch_n1_AN <0) || (pucch_n1_AN > 2047))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_n1_AN choice: 0..2047!\n",
-                   RC.config_file_name, i, pucch_n1_AN);
+		if ((pucch_n1_AN <0) || (pucch_n1_AN > 2047))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_n1_AN choice: 0..2047!\n",
+			       RC.config_file_name, i, pucch_n1_AN);
 
 #endif
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
 
-            if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_referenceSignalPower choice:-60..50!\n",
-                   RC.config_file_name, i, pdsch_referenceSignalPower);
+		if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_referenceSignalPower choice:-60..50!\n",
+			       RC.config_file_name, i, pdsch_referenceSignalPower);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pdsch_p_b = pdsch_p_b;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pdsch_p_b = pdsch_p_b;
 
-            if ((pdsch_p_b <0) || (pdsch_p_b > 3))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_p_b choice: 0..3!\n",
-                   RC.config_file_name, i, pdsch_p_b);
+		if ((pdsch_p_b <0) || (pdsch_p_b > 3))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pdsch_p_b choice: 0..3!\n",
+			       RC.config_file_name, i, pdsch_p_b);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_n_SB = pusch_n_SB;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_n_SB = pusch_n_SB;
 
-            if ((pusch_n_SB <1) || (pusch_n_SB > 4))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_n_SB choice: 1..4!\n",
-                   RC.config_file_name, i, pusch_n_SB);
+		if ((pusch_n_SB <1) || (pusch_n_SB > 4))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_n_SB choice: 1..4!\n",
+			       RC.config_file_name, i, pusch_n_SB);
 
-            if (!pusch_hoppingMode)
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d define %s: interSubframe,intraAndInterSubframe!\n",
-                   RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE);
-            else if (strcmp(pusch_hoppingMode, "interSubFrame") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_interSubFrame;
-            }
-            else if (strcmp(pusch_hoppingMode, "intraAndInterSubFrame") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_intraAndInterSubFrame;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingMode choice: interSubframe,intraAndInterSubframe!\n",
-                  RC.config_file_name, i, pusch_hoppingMode);
+		if (!pusch_hoppingMode)
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d define %s: interSubframe,intraAndInterSubframe!\n",
+			       RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_HOPPINGMODE);
+		else if (strcmp(pusch_hoppingMode, "interSubFrame") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_interSubFrame;
+		}
+		else if (strcmp(pusch_hoppingMode, "intraAndInterSubFrame") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_hoppingMode = PUSCH_ConfigCommon__pusch_ConfigBasic__hoppingMode_intraAndInterSubFrame;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingMode choice: interSubframe,intraAndInterSubframe!\n",
+			      RC.config_file_name, i, pusch_hoppingMode);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_hoppingOffset = pusch_hoppingOffset;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_hoppingOffset = pusch_hoppingOffset;
 
-            if ((pusch_hoppingOffset<0) || (pusch_hoppingOffset>98))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingOffset choice: 0..98!\n",
-                   RC.config_file_name, i, pusch_hoppingMode);
+		if ((pusch_hoppingOffset<0) || (pusch_hoppingOffset>98))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_hoppingOffset choice: 0..98!\n",
+			       RC.config_file_name, i, pusch_hoppingMode);
 
-            if (!pusch_enable64QAM)
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-                   RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM);
-            else if (strcmp(pusch_enable64QAM, "ENABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_enable64QAM = TRUE;
-            }
-            else if (strcmp(pusch_enable64QAM, "DISABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_enable64QAM = FALSE;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_enable64QAM choice: ENABLE,DISABLE!\n",
-                  RC.config_file_name, i, pusch_enable64QAM);
+		if (!pusch_enable64QAM)
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+			       RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_ENABLE64QAM);
+		else if (strcmp(pusch_enable64QAM, "ENABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_enable64QAM = TRUE;
+		}
+		else if (strcmp(pusch_enable64QAM, "DISABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_enable64QAM = FALSE;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_enable64QAM choice: ENABLE,DISABLE!\n",
+			      RC.config_file_name, i, pusch_enable64QAM);
 
-            if (!pusch_groupHoppingEnabled)
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-                  RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN);
-            else if (strcmp(pusch_groupHoppingEnabled, "ENABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_groupHoppingEnabled = TRUE;
-            }
-            else if (strcmp(pusch_groupHoppingEnabled, "DISABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_groupHoppingEnabled = FALSE;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_groupHoppingEnabled choice: ENABLE,DISABLE!\n",
-                  RC.config_file_name, i, pusch_groupHoppingEnabled);
+		if (!pusch_groupHoppingEnabled)
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+			      RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_GROUP_HOPPING_EN);
+		else if (strcmp(pusch_groupHoppingEnabled, "ENABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_groupHoppingEnabled = TRUE;
+		}
+		else if (strcmp(pusch_groupHoppingEnabled, "DISABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_groupHoppingEnabled = FALSE;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_groupHoppingEnabled choice: ENABLE,DISABLE!\n",
+			      RC.config_file_name, i, pusch_groupHoppingEnabled);
 
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_groupAssignment = pusch_groupAssignment;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_groupAssignment = pusch_groupAssignment;
 
-            if ((pusch_groupAssignment<0)||(pusch_groupAssignment>29))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_groupAssignment choice: 0..29!\n",
-                   RC.config_file_name, i, pusch_groupAssignment);
+		if ((pusch_groupAssignment<0)||(pusch_groupAssignment>29))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_groupAssignment choice: 0..29!\n",
+			       RC.config_file_name, i, pusch_groupAssignment);
 
-            if (!pusch_sequenceHoppingEnabled)
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
-                   RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN);
-            else if (strcmp(pusch_sequenceHoppingEnabled, "ENABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_sequenceHoppingEnabled = TRUE;
-            }
-            else if (strcmp(pusch_sequenceHoppingEnabled, "DISABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_sequenceHoppingEnabled = FALSE;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_sequenceHoppingEnabled choice: ENABLE,DISABLE!\n",
-                  RC.config_file_name, i, pusch_sequenceHoppingEnabled);
+		if (!pusch_sequenceHoppingEnabled)
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d define %s: ENABLE,DISABLE!\n",
+			       RC.config_file_name, i, ENB_CONFIG_STRING_PUSCH_SEQUENCE_HOPPING_EN);
+		else if (strcmp(pusch_sequenceHoppingEnabled, "ENABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_sequenceHoppingEnabled = TRUE;
+		}
+		else if (strcmp(pusch_sequenceHoppingEnabled, "DISABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_sequenceHoppingEnabled = FALSE;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pusch_sequenceHoppingEnabled choice: ENABLE,DISABLE!\n",
+			      RC.config_file_name, i, pusch_sequenceHoppingEnabled);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_nDMRS1 = pusch_nDMRS1;  //cyclic_shift in RRC!
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pusch_nDMRS1 = pusch_nDMRS1;  //cyclic_shift in RRC!
 
-            if ((pusch_nDMRS1 <0) || (pusch_nDMRS1>7))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_nDMRS1 choice: 0..7!\n",
-                   RC.config_file_name, i, pusch_nDMRS1);
+		if ((pusch_nDMRS1 <0) || (pusch_nDMRS1>7))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_nDMRS1 choice: 0..7!\n",
+			       RC.config_file_name, i, pusch_nDMRS1);
 
-            if (strcmp(phich_duration, "NORMAL") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration = PHICH_Config__phich_Duration_normal;
-            }
-            else if (strcmp(phich_duration, "EXTENDED") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration = PHICH_Config__phich_Duration_extended;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_duration choice: NORMAL,EXTENDED!\n",
-                  RC.config_file_name, i, phich_duration);
+		if (strcmp(phich_duration, "NORMAL") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration = PHICH_Config__phich_Duration_normal;
+		}
+		else if (strcmp(phich_duration, "EXTENDED") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration = PHICH_Config__phich_Duration_extended;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_duration choice: NORMAL,EXTENDED!\n",
+			      RC.config_file_name, i, phich_duration);
 
-            if (strcmp(phich_resource, "ONESIXTH") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_oneSixth;
-            }
-            else if (strcmp(phich_resource, "HALF") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_half;
-            }
-            else if (strcmp(phich_resource, "ONE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_one;
-            }
-            else if (strcmp(phich_resource, "TWO") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_two;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_resource choice: ONESIXTH,HALF,ONE,TWO!\n",
-                  RC.config_file_name, i, phich_resource);
+		if (strcmp(phich_resource, "ONESIXTH") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_oneSixth;
+		}
+		else if (strcmp(phich_resource, "HALF") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_half;
+		}
+		else if (strcmp(phich_resource, "ONE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_one;
+		}
+		else if (strcmp(phich_resource, "TWO") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource = PHICH_Config__phich_Resource_two;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for phich_resource choice: ONESIXTH,HALF,ONE,TWO!\n",
+			      RC.config_file_name, i, phich_resource);
 
-            printf("phich.resource %d (%s), phich.duration %d (%s)\n",
-               RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource, phich_resource,
-               RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration, phich_duration);
+		printf("phich.resource %d (%s), phich.duration %d (%s)\n",
+		       RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_resource, phich_resource,
+		       RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].phich_duration, phich_duration);
 
-            if (strcmp(srs_enable, "ENABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_enable = TRUE;
-            }
-            else if (strcmp(srs_enable, "DISABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_enable = FALSE;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
-                  RC.config_file_name, i, srs_enable);
+		if (strcmp(srs_enable, "ENABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_enable = TRUE;
+		}
+		else if (strcmp(srs_enable, "DISABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_enable = FALSE;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
+			      RC.config_file_name, i, srs_enable);
 
-            if (RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_enable == TRUE) {
-              if (!(config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SRS_BANDWIDTH_CONFIG, &srs_BandwidthConfig)
-                && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SRS_SUBFRAME_CONFIG, &srs_SubframeConfig)
-                && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_ACKNACKST_CONFIG, &srs_ackNackST)
-                && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_MAXUPPTS, &srs_MaxUpPts)
-                ))
-            AssertFatal(0,
-                    "Failed to parse eNB configuration file %s, enb %d unknown values for srs_BandwidthConfig, srs_SubframeConfig, srs_ackNackST, srs_MaxUpPts\n",
-                    RC.config_file_name, i);
+		if (RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_enable == TRUE) {
+		  if (!(config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SRS_BANDWIDTH_CONFIG, &srs_BandwidthConfig)
+			&& config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SRS_SUBFRAME_CONFIG, &srs_SubframeConfig)
+			&& config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_ACKNACKST_CONFIG, &srs_ackNackST)
+			&& config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_SRS_MAXUPPTS, &srs_MaxUpPts)
+			))
+		    AssertFatal(0,
+				"Failed to parse eNB configuration file %s, enb %d unknown values for srs_BandwidthConfig, srs_SubframeConfig, srs_ackNackST, srs_MaxUpPts\n",
+				RC.config_file_name, i);
 
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_BandwidthConfig = srs_BandwidthConfig;
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_BandwidthConfig = srs_BandwidthConfig;
 
-              if ((srs_BandwidthConfig < 0) || (srs_BandwidthConfig >7))
-            AssertFatal (0, "Failed to parse eNB configuration file %s, enb %d unknown value %d for srs_BandwidthConfig choice: 0...7\n",
-                     RC.config_file_name, i, srs_BandwidthConfig);
+		  if ((srs_BandwidthConfig < 0) || (srs_BandwidthConfig >7))
+		    AssertFatal (0, "Failed to parse eNB configuration file %s, enb %d unknown value %d for srs_BandwidthConfig choice: 0...7\n",
+				 RC.config_file_name, i, srs_BandwidthConfig);
 
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_SubframeConfig = srs_SubframeConfig;
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].srs_SubframeConfig = srs_SubframeConfig;
 
-              if ((srs_SubframeConfig<0) || (srs_SubframeConfig>15))
-            AssertFatal (0,
-                     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for srs_SubframeConfig choice: 0..15 !\n",
-                     RC.config_file_name, i, srs_SubframeConfig);
+		  if ((srs_SubframeConfig<0) || (srs_SubframeConfig>15))
+		    AssertFatal (0,
+				 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for srs_SubframeConfig choice: 0..15 !\n",
+				 RC.config_file_name, i, srs_SubframeConfig);
 
-              if (strcmp(srs_ackNackST, "ENABLE") == 0) {
-            RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_ackNackST = TRUE;
-              }
-              else if (strcmp(srs_ackNackST, "DISABLE") == 0) {
-            RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_ackNackST = FALSE;
-              }
-              else
-            AssertFatal(0,
-                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
-                    RC.config_file_name, i, srs_ackNackST);
+		  if (strcmp(srs_ackNackST, "ENABLE") == 0) {
+		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_ackNackST = TRUE;
+		  }
+		  else if (strcmp(srs_ackNackST, "DISABLE") == 0) {
+		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_ackNackST = FALSE;
+		  }
+		  else
+		    AssertFatal(0,
+				"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_BandwidthConfig choice: ENABLE,DISABLE !\n",
+				RC.config_file_name, i, srs_ackNackST);
 
-              if (strcmp(srs_MaxUpPts, "ENABLE") == 0) {
-            RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_MaxUpPts = TRUE;
-              }
-              else if (strcmp(srs_MaxUpPts, "DISABLE") == 0) {
-            RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_MaxUpPts = FALSE;
-              }
-              else
-            AssertFatal(0,
-                    "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_MaxUpPts choice: ENABLE,DISABLE !\n",
-                    RC.config_file_name, i, srs_MaxUpPts);
-            }
+		  if (strcmp(srs_MaxUpPts, "ENABLE") == 0) {
+		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_MaxUpPts = TRUE;
+		  }
+		  else if (strcmp(srs_MaxUpPts, "DISABLE") == 0) {
+		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].srs_MaxUpPts = FALSE;
+		  }
+		  else
+		    AssertFatal(0,
+				"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for srs_MaxUpPts choice: ENABLE,DISABLE !\n",
+				RC.config_file_name, i, srs_MaxUpPts);
+		}
 
-            RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_p0_Nominal = pusch_p0_Nominal;
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_p0_Nominal = pusch_p0_Nominal;
 
-            if ((pusch_p0_Nominal < -126) || (pusch_p0_Nominal > 24))
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
-                  RC.config_file_name, i, pusch_p0_Nominal);
+		if ((pusch_p0_Nominal < -126) || (pusch_p0_Nominal > 24))
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
+			      RC.config_file_name, i, pusch_p0_Nominal);
 
 #ifndef Rel14
-            if (strcmp(pusch_alpha, "AL0") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al0;
-            }
-            else if (strcmp(pusch_alpha, "AL04") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al04;
-            }
-            else if (strcmp(pusch_alpha, "AL05") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al05;
-            }
-            else if (strcmp(pusch_alpha, "AL06") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al06;
-            }
-            else if (strcmp(pusch_alpha, "AL07") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al07;
-            }
-            else if (strcmp(pusch_alpha, "AL08") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al08;
-            }
-            else if (strcmp(pusch_alpha, "AL09") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al09;
-            }
-            else if (strcmp(pusch_alpha, "AL1") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al1;
-            }
+		if (strcmp(pusch_alpha, "AL0") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al0;
+		}
+		else if (strcmp(pusch_alpha, "AL04") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al04;
+		}
+		else if (strcmp(pusch_alpha, "AL05") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al05;
+		}
+		else if (strcmp(pusch_alpha, "AL06") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al06;
+		}
+		else if (strcmp(pusch_alpha, "AL07") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al07;
+		}
+		else if (strcmp(pusch_alpha, "AL08") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al08;
+		}
+		else if (strcmp(pusch_alpha, "AL09") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al09;
+		}
+		else if (strcmp(pusch_alpha, "AL1") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = UplinkPowerControlCommon__alpha_al1;
+		}
 #else
-            if (strcmp(pusch_alpha, "AL0") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al0;
-            }
-            else if (strcmp(pusch_alpha, "AL04") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al04;
-            }
-            else if (strcmp(pusch_alpha, "AL05") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al05;
-            }
-            else if (strcmp(pusch_alpha, "AL06") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al06;
-            }
-            else if (strcmp(pusch_alpha, "AL07") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al07;
-            }
-            else if (strcmp(pusch_alpha, "AL08") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al08;
-            }
-            else if (strcmp(pusch_alpha, "AL09") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al09;
-            }
-            else if (strcmp(pusch_alpha, "AL1") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al1;
-            }
+		if (strcmp(pusch_alpha, "AL0") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al0;
+		}
+		else if (strcmp(pusch_alpha, "AL04") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al04;
+		}
+		else if (strcmp(pusch_alpha, "AL05") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al05;
+		}
+		else if (strcmp(pusch_alpha, "AL06") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al06;
+		}
+		else if (strcmp(pusch_alpha, "AL07") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al07;
+		}
+		else if (strcmp(pusch_alpha, "AL08") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al08;
+		}
+		else if (strcmp(pusch_alpha, "AL09") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al09;
+		}
+		else if (strcmp(pusch_alpha, "AL1") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pusch_alpha = Alpha_r12_al1;
+		}
 #endif
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
-                  RC.config_file_name, i, pusch_alpha);
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
+			      RC.config_file_name, i, pusch_alpha);
 
-            RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_p0_Nominal = pucch_p0_Nominal;
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_p0_Nominal = pucch_p0_Nominal;
 
-            if ((pucch_p0_Nominal < -127) || (pucch_p0_Nominal > -96))
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_p0_Nominal choice: -127..-96 !\n",
-                  RC.config_file_name, i, pucch_p0_Nominal);
+		if ((pucch_p0_Nominal < -127) || (pucch_p0_Nominal > -96))
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_p0_Nominal choice: -127..-96 !\n",
+			      RC.config_file_name, i, pucch_p0_Nominal);
 
-            RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].msg3_delta_Preamble = msg3_delta_Preamble;
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].msg3_delta_Preamble = msg3_delta_Preamble;
 
-            if ((msg3_delta_Preamble < -1) || (msg3_delta_Preamble > 6))
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for msg3_delta_Preamble choice: -1..6 !\n",
-                  RC.config_file_name, i, msg3_delta_Preamble);
+		if ((msg3_delta_Preamble < -1) || (msg3_delta_Preamble > 6))
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for msg3_delta_Preamble choice: -1..6 !\n",
+			      RC.config_file_name, i, msg3_delta_Preamble);
 
 
-            if (strcmp(pucch_deltaF_Format1, "deltaF_2") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1 = DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF_2;
-            }
-            else if (strcmp(pucch_deltaF_Format1, "deltaF0") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF0;
-            }
-            else if (strcmp(pucch_deltaF_Format1, "deltaF2") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF2;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1 choice: deltaF_2,dltaF0,deltaF2!\n",
-                  RC.config_file_name, i, pucch_deltaF_Format1);
+		if (strcmp(pucch_deltaF_Format1, "deltaF_2") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1 = DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF_2;
+		}
+		else if (strcmp(pucch_deltaF_Format1, "deltaF0") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF0;
+		}
+		else if (strcmp(pucch_deltaF_Format1, "deltaF2") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1= DeltaFList_PUCCH__deltaF_PUCCH_Format1_deltaF2;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1 choice: deltaF_2,dltaF0,deltaF2!\n",
+			      RC.config_file_name, i, pucch_deltaF_Format1);
 
-            if (strcmp(pucch_deltaF_Format1b, "deltaF1") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF1;
-            }
-            else if (strcmp(pucch_deltaF_Format1b, "deltaF3") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF3;
-            }
-            else if (strcmp(pucch_deltaF_Format1b, "deltaF5") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF5;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1b choice: deltaF1,dltaF3,deltaF5!\n",
-                  RC.config_file_name, i, pucch_deltaF_Format1b);
+		if (strcmp(pucch_deltaF_Format1b, "deltaF1") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF1;
+		}
+		else if (strcmp(pucch_deltaF_Format1b, "deltaF3") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF3;
+		}
+		else if (strcmp(pucch_deltaF_Format1b, "deltaF5") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format1b= DeltaFList_PUCCH__deltaF_PUCCH_Format1b_deltaF5;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format1b choice: deltaF1,dltaF3,deltaF5!\n",
+			      RC.config_file_name, i, pucch_deltaF_Format1b);
 
 
-            if (strcmp(pucch_deltaF_Format2, "deltaF_2") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF_2;
-            }
-            else if (strcmp(pucch_deltaF_Format2, "deltaF0") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF0;
-            }
-            else if (strcmp(pucch_deltaF_Format2, "deltaF1") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF1;
-            }
-            else if (strcmp(pucch_deltaF_Format2, "deltaF2") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF2;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2 choice: deltaF_2,dltaF0,deltaF1,deltaF2!\n",
-                  RC.config_file_name, i, pucch_deltaF_Format2);
+		if (strcmp(pucch_deltaF_Format2, "deltaF_2") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF_2;
+		}
+		else if (strcmp(pucch_deltaF_Format2, "deltaF0") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF0;
+		}
+		else if (strcmp(pucch_deltaF_Format2, "deltaF1") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF1;
+		}
+		else if (strcmp(pucch_deltaF_Format2, "deltaF2") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2= DeltaFList_PUCCH__deltaF_PUCCH_Format2_deltaF2;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2 choice: deltaF_2,dltaF0,deltaF1,deltaF2!\n",
+			      RC.config_file_name, i, pucch_deltaF_Format2);
 
-            if (strcmp(pucch_deltaF_Format2a, "deltaF_2") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF_2;
-            }
-            else if (strcmp(pucch_deltaF_Format2a, "deltaF0") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF0;
-            }
-            else if (strcmp(pucch_deltaF_Format2a, "deltaF2") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF2;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2a choice: deltaF_2,dltaF0,deltaF2!\n",
-                  RC.config_file_name, i, pucch_deltaF_Format2a);
+		if (strcmp(pucch_deltaF_Format2a, "deltaF_2") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF_2;
+		}
+		else if (strcmp(pucch_deltaF_Format2a, "deltaF0") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF0;
+		}
+		else if (strcmp(pucch_deltaF_Format2a, "deltaF2") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2a= DeltaFList_PUCCH__deltaF_PUCCH_Format2a_deltaF2;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2a choice: deltaF_2,dltaF0,deltaF2!\n",
+			      RC.config_file_name, i, pucch_deltaF_Format2a);
 
-            if (strcmp(pucch_deltaF_Format2b, "deltaF_2") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF_2;
-            }
-            else if (strcmp(pucch_deltaF_Format2b, "deltaF0") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF0;
-            }
-            else if (strcmp(pucch_deltaF_Format2b, "deltaF2") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF2;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2b choice: deltaF_2,dltaF0,deltaF2!\n",
-                  RC.config_file_name, i, pucch_deltaF_Format2b);
+		if (strcmp(pucch_deltaF_Format2b, "deltaF_2") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF_2;
+		}
+		else if (strcmp(pucch_deltaF_Format2b, "deltaF0") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF0;
+		}
+		else if (strcmp(pucch_deltaF_Format2b, "deltaF2") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pucch_deltaF_Format2b= DeltaFList_PUCCH__deltaF_PUCCH_Format2b_deltaF2;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_deltaF_Format2b choice: deltaF_2,dltaF0,deltaF2!\n",
+			      RC.config_file_name, i, pucch_deltaF_Format2b);
 
 
 
 
-            RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
+		RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_numberOfRA_Preambles= (rach_numberOfRA_Preambles / 4) - 1;
 
 
-            if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_numberOfRA_Preambles choice: 4,8,12,...,64!\n",
-                  RC.config_file_name, i, rach_numberOfRA_Preambles);
+		if ((rach_numberOfRA_Preambles < 4) || (rach_numberOfRA_Preambles > 64) || ((rach_numberOfRA_Preambles & 3) != 0))
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_numberOfRA_Preambles choice: 4,8,12,...,64!\n",
+			      RC.config_file_name, i, rach_numberOfRA_Preambles);
 
-            if (strcmp(rach_preamblesGroupAConfig, "ENABLE") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_preamblesGroupAConfig= TRUE;
+		if (strcmp(rach_preamblesGroupAConfig, "ENABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_preamblesGroupAConfig= TRUE;
 
-              if (!(config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, &rach_sizeOfRA_PreamblesGroupA)
-                && config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, &rach_messageSizeGroupA)
-                && config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_RACH_MESSAGEPOWEROFFSETGROUPB, &rach_messagePowerOffsetGroupB)))
-            AssertFatal (0,
-                     "Failed to parse eNB configuration file %s, enb %d  rach_sizeOfRA_PreamblesGroupA, messageSizeGroupA,messagePowerOffsetGroupB!\n",
-                     RC.config_file_name, i);
+		  if (!(config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, &rach_sizeOfRA_PreamblesGroupA)
+			&& config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, &rach_messageSizeGroupA)
+			&& config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_RACH_MESSAGEPOWEROFFSETGROUPB, &rach_messagePowerOffsetGroupB)))
+		    AssertFatal (0,
+				 "Failed to parse eNB configuration file %s, enb %d  rach_sizeOfRA_PreamblesGroupA, messageSizeGroupA,messagePowerOffsetGroupB!\n",
+				 RC.config_file_name, i);
 
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_sizeOfRA_PreamblesGroupA= (rach_sizeOfRA_PreamblesGroupA/4)-1;
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_sizeOfRA_PreamblesGroupA= (rach_sizeOfRA_PreamblesGroupA/4)-1;
 
-              if ((rach_numberOfRA_Preambles <4) || (rach_numberOfRA_Preambles>60) || ((rach_numberOfRA_Preambles&3)!=0))
-            AssertFatal (0,
-                     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_sizeOfRA_PreamblesGroupA choice: 4,8,12,...,60!\n",
-                     RC.config_file_name, i, rach_sizeOfRA_PreamblesGroupA);
+		  if ((rach_numberOfRA_Preambles <4) || (rach_numberOfRA_Preambles>60) || ((rach_numberOfRA_Preambles&3)!=0))
+		    AssertFatal (0,
+				 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_sizeOfRA_PreamblesGroupA choice: 4,8,12,...,60!\n",
+				 RC.config_file_name, i, rach_sizeOfRA_PreamblesGroupA);
 
 
-              switch (rach_messageSizeGroupA) {
-              case 56:
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b56;
-            break;
+		  switch (rach_messageSizeGroupA) {
+		  case 56:
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b56;
+		    break;
 
-              case 144:
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b144;
-            break;
+		  case 144:
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b144;
+		    break;
 
-              case 208:
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b208;
-            break;
+		  case 208:
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b208;
+		    break;
 
-              case 256:
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b256;
-            break;
+		  case 256:
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messageSizeGroupA= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messageSizeGroupA_b256;
+		    break;
 
-              default:
-            AssertFatal (0,
-                     "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_messageSizeGroupA choice: 56,144,208,256!\n",
-                     RC.config_file_name, i, rach_messageSizeGroupA);
-            break;
-              }
+		  default:
+		    AssertFatal (0,
+				 "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_messageSizeGroupA choice: 56,144,208,256!\n",
+				 RC.config_file_name, i, rach_messageSizeGroupA);
+		    break;
+		  }
 
-              if (strcmp(rach_messagePowerOffsetGroupB,"minusinfinity")==0) {
-                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_minusinfinity;
-              }
+		  if (strcmp(rach_messagePowerOffsetGroupB,"minusinfinity")==0) {
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_minusinfinity;
+		  }
 
-              else if (strcmp(rach_messagePowerOffsetGroupB,"dB0")==0) {
-                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB0;
-              }
+		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB0")==0) {
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB0;
+		  }
 
-              else if (strcmp(rach_messagePowerOffsetGroupB,"dB5")==0) {
-                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB5;
-              }
+		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB5")==0) {
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB5;
+		  }
 
-              else if (strcmp(rach_messagePowerOffsetGroupB,"dB8")==0) {
-                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB8;
-              }
+		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB8")==0) {
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB8;
+		  }
 
-              else if (strcmp(rach_messagePowerOffsetGroupB,"dB10")==0) {
-                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB10;
-              }
+		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB10")==0) {
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB10;
+		  }
 
-              else if (strcmp(rach_messagePowerOffsetGroupB,"dB12")==0) {
-                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB12;
-              }
+		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB12")==0) {
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB12;
+		  }
 
-              else if (strcmp(rach_messagePowerOffsetGroupB,"dB15")==0) {
-                  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB15;
-              }
+		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB15")==0) {
+		    RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB15;
+		  }
 
-              else if (strcmp(rach_messagePowerOffsetGroupB,"dB18")==0) {
-                  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB18;
-              }
-              else
-                  AssertFatal(0,
-                              "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_messagePowerOffsetGroupB choice: minusinfinity,dB0,dB5,dB8,dB10,dB12,dB15,dB18!\n",
-                              RC.config_file_name, i, rach_messagePowerOffsetGroupB);
+		  else if (strcmp(rach_messagePowerOffsetGroupB,"dB18")==0) {
+		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_messagePowerOffsetGroupB= RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB_dB18;
+		  }
+		  else
+		    AssertFatal(0,
+				"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_messagePowerOffsetGroupB choice: minusinfinity,dB0,dB5,dB8,dB10,dB12,dB15,dB18!\n",
+				RC.config_file_name, i, rach_messagePowerOffsetGroupB);
 
-            }
-            else if (strcmp(rach_preamblesGroupAConfig, "DISABLE") == 0) {
-                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_preamblesGroupAConfig= FALSE;
-            }
-            else
-                AssertFatal(0,
-                            "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_preamblesGroupAConfig choice: ENABLE,DISABLE !\n",
-                            RC.config_file_name, i, rach_preamblesGroupAConfig);
+		}
+		else if (strcmp(rach_preamblesGroupAConfig, "DISABLE") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].rach_preamblesGroupAConfig= FALSE;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for rach_preamblesGroupAConfig choice: ENABLE,DISABLE !\n",
+			      RC.config_file_name, i, rach_preamblesGroupAConfig);
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleInitialReceivedTargetPower= (rach_preambleInitialReceivedTargetPower+120)/2;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleInitialReceivedTargetPower= (rach_preambleInitialReceivedTargetPower+120)/2;
 
-            if ((rach_preambleInitialReceivedTargetPower<-120) || (rach_preambleInitialReceivedTargetPower>-90) || ((rach_preambleInitialReceivedTargetPower&1)!=0))
-                AssertFatal (0,
-                             "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleInitialReceivedTargetPower choice: -120,-118,...,-90 !\n",
-                             RC.config_file_name, i, rach_preambleInitialReceivedTargetPower);
+		if ((rach_preambleInitialReceivedTargetPower<-120) || (rach_preambleInitialReceivedTargetPower>-90) || ((rach_preambleInitialReceivedTargetPower&1)!=0))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleInitialReceivedTargetPower choice: -120,-118,...,-90 !\n",
+			       RC.config_file_name, i, rach_preambleInitialReceivedTargetPower);
 
 
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_powerRampingStep= rach_powerRampingStep/2;
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_powerRampingStep= rach_powerRampingStep/2;
 
-            if ((rach_powerRampingStep<0) || (rach_powerRampingStep>6) || ((rach_powerRampingStep&1)!=0))
-                AssertFatal (0,
-                             "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_powerRampingStep choice: 0,2,4,6 !\n",
-                             RC.config_file_name, i, rach_powerRampingStep);
+		if ((rach_powerRampingStep<0) || (rach_powerRampingStep>6) || ((rach_powerRampingStep&1)!=0))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_powerRampingStep choice: 0,2,4,6 !\n",
+			       RC.config_file_name, i, rach_powerRampingStep);
 
 
 
-            switch (rach_preambleTransMax) {
+		switch (rach_preambleTransMax) {
 #ifndef Rel14
-            case 3:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n3;
-              break;
+		case 3:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n3;
+		  break;
 
-            case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n4;
-              break;
+		case 4:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n4;
+		  break;
 
-            case 5:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n5;
-              break;
+		case 5:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n5;
+		  break;
 
-            case 6:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n6;
-              break;
+		case 6:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n6;
+		  break;
 
-            case 7:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n7;
-              break;
+		case 7:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n7;
+		  break;
 
-            case 8:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n8;
-              break;
+		case 8:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n8;
+		  break;
 
-            case 10:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n10;
-              break;
+		case 10:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n10;
+		  break;
 
-            case 20:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n20;
-              break;
+		case 20:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n20;
+		  break;
 
-            case 50:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n50;
-              break;
+		case 50:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n50;
+		  break;
 
-            case 100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n100;
-              break;
+		case 100:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n100;
+		  break;
 
-            case 200:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n200;
-              break;
+		case 200:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n200;
+		  break;
 
 #else
 
-            case 3:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n3;
-              break;
+		case 3:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n3;
+		  break;
 
-            case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n4;
-              break;
+		case 4:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n4;
+		  break;
 
-            case 5:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n5;
-              break;
+		case 5:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n5;
+		  break;
 
-            case 6:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n6;
-              break;
+		case 6:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n6;
+		  break;
 
-            case 7:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n7;
-              break;
+		case 7:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n7;
+		  break;
 
-            case 8:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n8;
-              break;
+		case 8:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n8;
+		  break;
 
-            case 10:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n10;
-              break;
+		case 10:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n10;
+		  break;
 
-            case 20:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n20;
-              break;
+		case 20:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n20;
+		  break;
 
-            case 50:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n50;
-              break;
+		case 50:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n50;
+		  break;
 
-            case 100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n100;
-              break;
+		case 100:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n100;
+		  break;
 
-            case 200:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n200;
-              break;
+		case 200:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_preambleTransMax=  PreambleTransMax_n200;
+		  break;
 #endif
 
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleTransMax choice: 3,4,5,6,7,8,10,20,50,100,200!\n",
-                   RC.config_file_name, i, rach_preambleTransMax);
-              break;
-            }
-
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_raResponseWindowSize=  (rach_raResponseWindowSize==10)?7:rach_raResponseWindowSize-2;
-
-            if ((rach_raResponseWindowSize<0)||(rach_raResponseWindowSize==9)||(rach_raResponseWindowSize>10))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_raResponseWindowSize choice: 2,3,4,5,6,7,8,10!\n",
-                   RC.config_file_name, i, rach_preambleTransMax);
-
-
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_macContentionResolutionTimer= (rach_macContentionResolutionTimer/8)-1;
-
-            if ((rach_macContentionResolutionTimer<8) || (rach_macContentionResolutionTimer>64) || ((rach_macContentionResolutionTimer&7)!=0))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_macContentionResolutionTimer choice: 8,16,...,56,64!\n",
-                   RC.config_file_name, i, rach_preambleTransMax);
-
-            RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_maxHARQ_Msg3Tx= rach_maxHARQ_Msg3Tx;
-
-            if ((rach_maxHARQ_Msg3Tx<0) || (rach_maxHARQ_Msg3Tx>8))
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_maxHARQ_Msg3Tx choice: 1..8!\n",
-                   RC.config_file_name, i, rach_preambleTransMax);
-
-
-            switch (pcch_defaultPagingCycle) {
-            case 32:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf32;
-              break;
-
-            case 64:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf64;
-              break;
-
-            case 128:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf128;
-              break;
-
-            case 256:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf256;
-              break;
-
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_defaultPagingCycle choice: 32,64,128,256!\n",
-                   RC.config_file_name, i, pcch_defaultPagingCycle);
-              break;
-            }
-
-            if (strcmp(pcch_nB, "fourT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_fourT;
-            }
-            else if (strcmp(pcch_nB, "twoT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_twoT;
-            }
-            else if (strcmp(pcch_nB, "oneT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneT;
-            }
-            else if (strcmp(pcch_nB, "halfT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_halfT;
-            }
-            else if (strcmp(pcch_nB, "quarterT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_quarterT;
-            }
-            else if (strcmp(pcch_nB, "oneEighthT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneEighthT;
-            }
-            else if (strcmp(pcch_nB, "oneSixteenthT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneSixteenthT;
-            }
-            else if (strcmp(pcch_nB, "oneThirtySecondT") == 0) {
-              RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneThirtySecondT;
-            }
-            else
-              AssertFatal(0,
-                  "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_nB choice: fourT,twoT,oneT,halfT,quarterT,oneighthT,oneSixteenthT,oneThirtySecondT !\n",
-                  RC.config_file_name, i, pcch_defaultPagingCycle);
-
-
-
-            switch (bcch_modificationPeriodCoeff) {
-            case 2:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n2;
-              break;
-
-            case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n4;
-              break;
-
-            case 8:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n8;
-              break;
-
-            case 16:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n16;
-              break;
-
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for bcch_modificationPeriodCoeff choice: 2,4,8,16",
-                   RC.config_file_name, i, bcch_modificationPeriodCoeff);
-
-              break;
-            }
-
-
-            switch (ue_TimersAndConstants_t300) {
-            case 100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms100;
-              break;
-
-            case 200:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms200;
-              break;
-
-            case 300:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms300;
-              break;
-
-            case 400:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms400;
-              break;
-
-            case 600:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms600;
-              break;
-
-            case 1000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms1000;
-              break;
-
-            case 1500:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms1500;
-              break;
-
-            case 2000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms2000;
-              break;
-
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t300 choice: 100,200,300,400,600,1000,1500,2000 ",
-                   RC.config_file_name, i, ue_TimersAndConstants_t300);
-              break;
-
-            }
-
-            switch (ue_TimersAndConstants_t301) {
-            case 100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301 = UE_TimersAndConstants__t301_ms100;
-              break;
-
-            case 200:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301 = UE_TimersAndConstants__t301_ms200;
-              break;
-
-            case 300:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms300;
-              break;
-
-            case 400:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms400;
-              break;
-
-            case 600:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms600;
-              break;
-
-            case 1000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1000;
-              break;
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_preambleTransMax choice: 3,4,5,6,7,8,10,20,50,100,200!\n",
+			       RC.config_file_name, i, rach_preambleTransMax);
+		  break;
+		}
+
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_raResponseWindowSize=  (rach_raResponseWindowSize==10)?7:rach_raResponseWindowSize-2;
+
+		if ((rach_raResponseWindowSize<0)||(rach_raResponseWindowSize==9)||(rach_raResponseWindowSize>10))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_raResponseWindowSize choice: 2,3,4,5,6,7,8,10!\n",
+			       RC.config_file_name, i, rach_preambleTransMax);
+
+
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_macContentionResolutionTimer= (rach_macContentionResolutionTimer/8)-1;
+
+		if ((rach_macContentionResolutionTimer<8) || (rach_macContentionResolutionTimer>64) || ((rach_macContentionResolutionTimer&7)!=0))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_macContentionResolutionTimer choice: 8,16,...,56,64!\n",
+			       RC.config_file_name, i, rach_preambleTransMax);
+
+		RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].rach_maxHARQ_Msg3Tx= rach_maxHARQ_Msg3Tx;
+
+		if ((rach_maxHARQ_Msg3Tx<0) || (rach_maxHARQ_Msg3Tx>8))
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for rach_maxHARQ_Msg3Tx choice: 1..8!\n",
+			       RC.config_file_name, i, rach_preambleTransMax);
+
+
+		switch (pcch_defaultPagingCycle) {
+		case 32:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf32;
+		  break;
+
+		case 64:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf64;
+		  break;
+
+		case 128:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf128;
+		  break;
+
+		case 256:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].pcch_defaultPagingCycle= PCCH_Config__defaultPagingCycle_rf256;
+		  break;
+
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_defaultPagingCycle choice: 32,64,128,256!\n",
+			       RC.config_file_name, i, pcch_defaultPagingCycle);
+		  break;
+		}
+
+		if (strcmp(pcch_nB, "fourT") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_fourT;
+		}
+		else if (strcmp(pcch_nB, "twoT") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_twoT;
+		}
+		else if (strcmp(pcch_nB, "oneT") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneT;
+		}
+		else if (strcmp(pcch_nB, "halfT") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_halfT;
+		}
+		else if (strcmp(pcch_nB, "quarterT") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_quarterT;
+		}
+		else if (strcmp(pcch_nB, "oneEighthT") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneEighthT;
+		}
+		else if (strcmp(pcch_nB, "oneSixteenthT") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneSixteenthT;
+		}
+		else if (strcmp(pcch_nB, "oneThirtySecondT") == 0) {
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].pcch_nB= PCCH_Config__nB_oneThirtySecondT;
+		}
+		else
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pcch_nB choice: fourT,twoT,oneT,halfT,quarterT,oneighthT,oneSixteenthT,oneThirtySecondT !\n",
+			      RC.config_file_name, i, pcch_defaultPagingCycle);
+
+
+
+		switch (bcch_modificationPeriodCoeff) {
+		case 2:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n2;
+		  break;
+
+		case 4:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n4;
+		  break;
+
+		case 8:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n8;
+		  break;
+
+		case 16:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].bcch_modificationPeriodCoeff = BCCH_Config__modificationPeriodCoeff_n16;
+		  break;
+
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for bcch_modificationPeriodCoeff choice: 2,4,8,16",
+			       RC.config_file_name, i, bcch_modificationPeriodCoeff);
+
+		  break;
+		}
+
+
+		switch (ue_TimersAndConstants_t300) {
+		case 100:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms100;
+		  break;
+
+		case 200:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms200;
+		  break;
+
+		case 300:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms300;
+		  break;
+
+		case 400:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms400;
+		  break;
+
+		case 600:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms600;
+		  break;
+
+		case 1000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms1000;
+		  break;
+
+		case 1500:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms1500;
+		  break;
+
+		case 2000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t300 = UE_TimersAndConstants__t300_ms2000;
+		  break;
+
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t300 choice: 100,200,300,400,600,1000,1500,2000 ",
+			       RC.config_file_name, i, ue_TimersAndConstants_t300);
+		  break;
+
+		}
+
+		switch (ue_TimersAndConstants_t301) {
+		case 100:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301 = UE_TimersAndConstants__t301_ms100;
+		  break;
+
+		case 200:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301 = UE_TimersAndConstants__t301_ms200;
+		  break;
+
+		case 300:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms300;
+		  break;
+
+		case 400:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms400;
+		  break;
+
+		case 600:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms600;
+		  break;
+
+		case 1000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1000;
+		  break;
 
-            case 1500:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1500;
-              break;
+		case 1500:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms1500;
+		  break;
 
-            case 2000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms2000;
-              break;
+		case 2000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t301= UE_TimersAndConstants__t301_ms2000;
+		  break;
 
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t301 choice: 100,200,300,400,600,1000,1500,2000 ",
-                   RC.config_file_name, i, ue_TimersAndConstants_t301);
-              break;
-
-            }
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t301 choice: 100,200,300,400,600,1000,1500,2000 ",
+			       RC.config_file_name, i, ue_TimersAndConstants_t301);
+		  break;
+
+		}
 
-            switch (ue_TimersAndConstants_t310) {
-            case 0:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms0;
-              break;
+		switch (ue_TimersAndConstants_t310) {
+		case 0:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms0;
+		  break;
 
-            case 50:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms50;
-              break;
+		case 50:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms50;
+		  break;
 
-            case 100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms100;
-              break;
+		case 100:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms100;
+		  break;
 
-            case 200:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms200;
-              break;
+		case 200:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms200;
+		  break;
 
-            case 500:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms500;
-              break;
-
-            case 1000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms1000;
-              break;
-
-            case 2000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms2000;
-              break;
-
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t310 choice: 0,50,100,200,500,1000,1500,2000 ",
-                   RC.config_file_name, i, ue_TimersAndConstants_t310);
-              break;
-
-            }
-
-            switch (ue_TimersAndConstants_t311) {
-            case 1000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms1000;
-              break;
-
-            case 3110:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms3000;
-              break;
-
-            case 5000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms5000;
-              break;
-
-            case 10000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms10000;
-              break;
-
-            case 15000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms15000;
-              break;
-
-            case 20000:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms20000;
-              break;
-
-            case 31100:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms30000;
-              break;
-
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1000,3000,5000,10000,150000,20000,30000",
-                   RC.config_file_name, i, ue_TimersAndConstants_t311);
-              break;
-
-            }
-
-            switch (ue_TimersAndConstants_n310) {
-            case 1:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n1;
-              break;
-
-            case 2:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n2;
-              break;
-
-            case 3:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n3;
-              break;
-
-            case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n4;
-              break;
-
-            case 6:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n6;
-              break;
-
-            case 8:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n8;
-              break;
-
-            case 10:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n10;
-              break;
-
-            case 20:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n20;
-              break;
-
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_n310 choice: 1,2,3,4,6,6,8,10,20",
-                   RC.config_file_name, i, ue_TimersAndConstants_n311);
-              break;
-
-            }
-
-            switch (ue_TimersAndConstants_n311) {
-            case 1:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n1;
-              break;
-
-            case 2:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n2;
-              break;
-
-            case 3:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n3;
-              break;
-
-            case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n4;
-              break;
-
-            case 5:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n5;
-              break;
-
-            case 6:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n6;
-              break;
-
-            case 8:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n8;
-              break;
-
-            case 10:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n10;
-              break;
-
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1,2,3,4,5,6,8,10",
-                   RC.config_file_name, i, ue_TimersAndConstants_t311);
-              break;
-
-            }
-
-            switch (ue_TransmissionMode) {
-            case 1:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm1;
-              break;
-            case 2:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm2;
-              break;
-            case 3:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm3;
-              break;
-            case 4:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm4;
-              break;
-            case 5:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm5;
-              break;
-            case 6:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm6;
-              break;
-            case 7:
-              RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm7;
-              break;
-            default:
-              AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TransmissionMode choice: 1,2,3,4,5,6,7",
-                   RC.config_file_name, i, ue_TransmissionMode);
-              break;
-            }
-
-            int hyperSFN_r13;
-            int eDRX_Allowed_r13;
-            int q_RxLevMinCE_r13;
-            int q_QualMinRSRQ_CE_r13;
-            int si_WindowLength_BR_r13;
-            int si_RepetitionPattern_r13;
-            uint64_t fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
-            int startSymbolBR_r13;
-            int si_HoppingConfigCommon_r13;
-            int si_ValidityTime_r13;
-            int mpdcch_pdsch_HoppingNB_r13;
-            int interval_DLHoppingConfigCommonModeA_r13_val;
-            int interval_DLHoppingConfigCommonModeB_r13_val;
-            int mpdcch_pdsch_HoppingOffset_r13;
-            int preambleTransMax_CE_r13;
-            int mpdcch_startSF_CSS_RA_r13_val;
-            int prach_HoppingOffset_r13;
-            int schedulingInfoSIB1_BR_r13;
-            char* cellSelectionInfoCE_r13 = NULL;
-            char* bandwidthReducedAccessRelatedInfo_r13 = NULL;
-            char* fdd_DownlinkOrTddSubframeBitmapBR_r13 = NULL;
-            char* fdd_UplinkSubframeBitmapBR_r13 = NULL;
-            char* freqHoppingParametersDL_r13 = NULL;
-            char* interval_DLHoppingConfigCommonModeA_r13 = NULL;
-            char* interval_DLHoppingConfigCommonModeB_r13 = NULL;
-            char* prach_ConfigCommon_v1310 = NULL;
-            char* mpdcch_startSF_CSS_RA_r13;
-
-
-            if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_schedulingInfoSIB1, &schedulingInfoSIB1_BR_r13))
-                AssertFatal(0,
-                            "Failed to parse eNB configuration file %s, enb %d  schedulingInfoSIB1_BR_r13!\n",
-                            RC.config_file_name, i);
-            RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j]= schedulingInfoSIB1_BR_r13;
-
-
-            if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_HYPERSFN, &hyperSFN_r13))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= calloc(1, sizeof(uint16_t));
-                *RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= (uint16_t)hyperSFN_r13;
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= NULL;
-
-            if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_EDRX_ALLOWED, &eDRX_Allowed_r13))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= calloc(1, sizeof(long));
-                *RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= eDRX_Allowed_r13;
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= NULL;
-
-            if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_CELLSELECTIONINFOCE, &cellSelectionInfoCE_r13) && !strcmp(cellSelectionInfoCE_r13, "ENABLE"))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).cellSelectionInfoCE_r13[j]= TRUE;
-                if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_RXLEVMINCE, &q_RxLevMinCE_r13))
-                {
-                    AssertFatal(0,
-                                "Failed to parse eNB configuration file %s, enb %d  q_RxLevMinCE_r13!\n",
-                                RC.config_file_name, i);
-
-                }
-                RRC_CONFIGURATION_REQ(msg_p).q_RxLevMinCE_r13[j]= q_RxLevMinCE_r13;
-
-                if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_QUALMINRSRQ_CE, &q_QualMinRSRQ_CE_r13))
-                {
-                    RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= calloc(1, sizeof(long));
-                    *RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= q_QualMinRSRQ_CE_r13;
-
-                }
-                else
-                    RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= NULL;
-
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).cellSelectionInfoCE_r13[j]= FALSE;
-
-            if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_BRAccessRelatedInfo, &bandwidthReducedAccessRelatedInfo_r13) && !strcmp(bandwidthReducedAccessRelatedInfo_r13, "ENABLE"))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = TRUE;
-                if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_WINDOWLENGTH_BR, &si_WindowLength_BR_r13) ||
+		case 500:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms500;
+		  break;
+
+		case 1000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms1000;
+		  break;
+
+		case 2000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t310= UE_TimersAndConstants__t310_ms2000;
+		  break;
+
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t310 choice: 0,50,100,200,500,1000,1500,2000 ",
+			       RC.config_file_name, i, ue_TimersAndConstants_t310);
+		  break;
+
+		}
+
+		switch (ue_TimersAndConstants_t311) {
+		case 1000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms1000;
+		  break;
+
+		case 3110:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms3000;
+		  break;
+
+		case 5000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms5000;
+		  break;
+
+		case 10000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms10000;
+		  break;
+
+		case 15000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms15000;
+		  break;
+
+		case 20000:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms20000;
+		  break;
+
+		case 31100:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_t311= UE_TimersAndConstants__t311_ms30000;
+		  break;
+
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1000,3000,5000,10000,150000,20000,30000",
+			       RC.config_file_name, i, ue_TimersAndConstants_t311);
+		  break;
+
+		}
+
+		switch (ue_TimersAndConstants_n310) {
+		case 1:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n1;
+		  break;
+
+		case 2:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n2;
+		  break;
+
+		case 3:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n3;
+		  break;
+
+		case 4:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n4;
+		  break;
+
+		case 6:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n6;
+		  break;
+
+		case 8:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n8;
+		  break;
+
+		case 10:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n10;
+		  break;
+
+		case 20:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n310= UE_TimersAndConstants__n310_n20;
+		  break;
+
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_n310 choice: 1,2,3,4,6,6,8,10,20",
+			       RC.config_file_name, i, ue_TimersAndConstants_n311);
+		  break;
+
+		}
+
+		switch (ue_TimersAndConstants_n311) {
+		case 1:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n1;
+		  break;
+
+		case 2:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n2;
+		  break;
+
+		case 3:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n3;
+		  break;
+
+		case 4:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n4;
+		  break;
+
+		case 5:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n5;
+		  break;
+
+		case 6:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n6;
+		  break;
+
+		case 8:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n8;
+		  break;
+
+		case 10:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TimersAndConstants_n311= UE_TimersAndConstants__n311_n10;
+		  break;
+
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TimersAndConstants_t311 choice: 1,2,3,4,5,6,8,10",
+			       RC.config_file_name, i, ue_TimersAndConstants_t311);
+		  break;
+
+		}
+
+		switch (ue_TransmissionMode) {
+		case 1:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm1;
+		  break;
+		case 2:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm2;
+		  break;
+		case 3:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm3;
+		  break;
+		case 4:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm4;
+		  break;
+		case 5:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm5;
+		  break;
+		case 6:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm6;
+		  break;
+		case 7:
+		  RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig_BR[j].ue_TransmissionMode= AntennaInfoDedicated__transmissionMode_tm7;
+		  break;
+		default:
+		  AssertFatal (0,
+			       "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for ue_TransmissionMode choice: 1,2,3,4,5,6,7",
+			       RC.config_file_name, i, ue_TransmissionMode);
+		  break;
+		}
+
+		int hyperSFN_r13;
+		int eDRX_Allowed_r13;
+		int q_RxLevMinCE_r13;
+		int q_QualMinRSRQ_CE_r13;
+		int si_WindowLength_BR_r13;
+		int si_RepetitionPattern_r13;
+		uint64_t fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
+		int startSymbolBR_r13;
+		int si_HoppingConfigCommon_r13;
+		int si_ValidityTime_r13;
+		int mpdcch_pdsch_HoppingNB_r13;
+		int interval_DLHoppingConfigCommonModeA_r13_val;
+		int interval_DLHoppingConfigCommonModeB_r13_val;
+		int mpdcch_pdsch_HoppingOffset_r13;
+		int preambleTransMax_CE_r13;
+		int mpdcch_startSF_CSS_RA_r13_val;
+		int prach_HoppingOffset_r13;
+		int schedulingInfoSIB1_BR_r13;
+		char* cellSelectionInfoCE_r13 = NULL;
+		char* bandwidthReducedAccessRelatedInfo_r13 = NULL;
+		char* fdd_DownlinkOrTddSubframeBitmapBR_r13 = NULL;
+		char* fdd_UplinkSubframeBitmapBR_r13 = NULL;
+		char* freqHoppingParametersDL_r13 = NULL;
+		char* interval_DLHoppingConfigCommonModeA_r13 = NULL;
+		char* interval_DLHoppingConfigCommonModeB_r13 = NULL;
+		char* prach_ConfigCommon_v1310 = NULL;
+		char* mpdcch_startSF_CSS_RA_r13;
+
+
+		if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_schedulingInfoSIB1, &schedulingInfoSIB1_BR_r13))
+		  AssertFatal(0,
+			      "Failed to parse eNB configuration file %s, enb %d  schedulingInfoSIB1_BR_r13!\n",
+			      RC.config_file_name, i);
+		RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j]= schedulingInfoSIB1_BR_r13;
+
+
+		if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_HYPERSFN, &hyperSFN_r13))
+		  {
+		    RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= calloc(1, sizeof(uint16_t));
+		    *RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= (uint16_t)hyperSFN_r13;
+		  }
+		else
+		  RRC_CONFIGURATION_REQ(msg_p).hyperSFN_r13[j]= NULL;
+
+		if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_EDRX_ALLOWED, &eDRX_Allowed_r13))
+		  {
+		    RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= calloc(1, sizeof(long));
+		    *RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= eDRX_Allowed_r13;
+		  }
+		else
+		  RRC_CONFIGURATION_REQ(msg_p).eDRX_Allowed_r13[j]= NULL;
+
+		if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_CELLSELECTIONINFOCE, &cellSelectionInfoCE_r13) && !strcmp(cellSelectionInfoCE_r13, "ENABLE"))
+		  {
+		    RRC_CONFIGURATION_REQ(msg_p).cellSelectionInfoCE_r13[j]= TRUE;
+		    if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_RXLEVMINCE, &q_RxLevMinCE_r13))
+		      {
+			AssertFatal(0,
+				    "Failed to parse eNB configuration file %s, enb %d  q_RxLevMinCE_r13!\n",
+				    RC.config_file_name, i);
+
+		      }
+		    RRC_CONFIGURATION_REQ(msg_p).q_RxLevMinCE_r13[j]= q_RxLevMinCE_r13;
+
+		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_QUALMINRSRQ_CE, &q_QualMinRSRQ_CE_r13))
+		      {
+			RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= calloc(1, sizeof(long));
+			*RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= q_QualMinRSRQ_CE_r13;
+
+		      }
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).q_QualMinRSRQ_CE_r13[j]= NULL;
+
+		  }
+		else
+		  RRC_CONFIGURATION_REQ(msg_p).cellSelectionInfoCE_r13[j]= FALSE;
+
+		if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_BRAccessRelatedInfo, &bandwidthReducedAccessRelatedInfo_r13) && !strcmp(bandwidthReducedAccessRelatedInfo_r13, "ENABLE"))
+		  {
+		    RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = TRUE;
+		    if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_WINDOWLENGTH_BR, &si_WindowLength_BR_r13) ||
                         !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_REPETITIONPATTERN, &si_RepetitionPattern_r13) ||
                         !config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDD_SFB_BR, &fdd_DownlinkOrTddSubframeBitmapBR_r13) ||
                         !config_setting_lookup_int64(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDDSFB_BR_VAL, &fdd_DownlinkOrTddSubframeBitmapBR_val_r13) ||
                         !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_FDD_ULSUBFRAMEBITMAPBR, &fdd_UplinkSubframeBitmapBR_r13) ||
                         !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_STARTSYMBOLBR, &startSymbolBR_r13) ||
                         !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_HOPPINGCONFIGCOMMON, &si_HoppingConfigCommon_r13))
-                {
-                    AssertFatal(0,
-                                "Failed to parse eNB configuration file %s, enb %d  si_WindowLength_BR_r13, si_RepetitionPattern_r13, fdd_DownlinkOrTddSubframeBitmapBR_r13, fdd_UplinkSubframeBitmapBR_r13!\n",
-                                RC.config_file_name, i);
+		      {
+			AssertFatal(0,
+				    "Failed to parse eNB configuration file %s, enb %d  si_WindowLength_BR_r13, si_RepetitionPattern_r13, fdd_DownlinkOrTddSubframeBitmapBR_r13, fdd_UplinkSubframeBitmapBR_r13!\n",
+				    RC.config_file_name, i);
 
-                }
-                RRC_CONFIGURATION_REQ(msg_p).si_WindowLength_BR_r13[j] = si_WindowLength_BR_r13;
-                RRC_CONFIGURATION_REQ(msg_p).si_RepetitionPattern_r13[j] = si_RepetitionPattern_r13;
-                if (!strcmp(fdd_DownlinkOrTddSubframeBitmapBR_r13, "subframePattern40-r13"))
-                    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = FALSE;
-                else
-                    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = TRUE;
-                RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_val_r13[j] = fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
-                RRC_CONFIGURATION_REQ(msg_p).fdd_UplinkSubframeBitmapBR_r13[j] = fdd_UplinkSubframeBitmapBR_r13;
-                RRC_CONFIGURATION_REQ(msg_p).si_HoppingConfigCommon_r13[j] = si_HoppingConfigCommon_r13;
-                RRC_CONFIGURATION_REQ(msg_p).startSymbolBR_r13[j] = startSymbolBR_r13;
+		      }
+		    RRC_CONFIGURATION_REQ(msg_p).si_WindowLength_BR_r13[j] = si_WindowLength_BR_r13;
+		    RRC_CONFIGURATION_REQ(msg_p).si_RepetitionPattern_r13[j] = si_RepetitionPattern_r13;
+		    if (!strcmp(fdd_DownlinkOrTddSubframeBitmapBR_r13, "subframePattern40-r13"))
+		      RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = FALSE;
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = TRUE;
+		    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_val_r13[j] = fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
+		    RRC_CONFIGURATION_REQ(msg_p).fdd_UplinkSubframeBitmapBR_r13[j] = fdd_UplinkSubframeBitmapBR_r13;
+		    RRC_CONFIGURATION_REQ(msg_p).si_HoppingConfigCommon_r13[j] = si_HoppingConfigCommon_r13;
+		    RRC_CONFIGURATION_REQ(msg_p).startSymbolBR_r13[j] = startSymbolBR_r13;
 
-                if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_QUALMINRSRQ_CE, &si_ValidityTime_r13))
-                {
-                    RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = calloc(1, sizeof(long));
-                    *RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = si_ValidityTime_r13;
+		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_Q_QUALMINRSRQ_CE, &si_ValidityTime_r13))
+		      {
+			RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = calloc(1, sizeof(long));
+			*RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = si_ValidityTime_r13;
 
-                }
-                else
-                    RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = NULL;
+		      }
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).si_ValidityTime_r13[j] = NULL;
 
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = FALSE;
+		  }
+		else
+		  RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = FALSE;
 
-            if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FREQHOPPINGPARAMETERSDL, &freqHoppingParametersDL_r13) && !strcmp(freqHoppingParametersDL_r13, "ENABLE"))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).freqHoppingParametersDL_r13[j] = TRUE;
-                if (!config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB, &interval_DLHoppingConfigCommonModeA_r13) ||
+		if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FREQHOPPINGPARAMETERSDL, &freqHoppingParametersDL_r13) && !strcmp(freqHoppingParametersDL_r13, "ENABLE"))
+		  {
+		    RRC_CONFIGURATION_REQ(msg_p).freqHoppingParametersDL_r13[j] = TRUE;
+		    if (!config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB, &interval_DLHoppingConfigCommonModeA_r13) ||
                         !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB_VAL, &interval_DLHoppingConfigCommonModeA_r13_val) ||
                         !config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB, &interval_DLHoppingConfigCommonModeB_r13) ||
                         !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_INTERVAL_DLHOPPINGCONFIGCOMMONMODEB_VAL, &interval_DLHoppingConfigCommonModeB_r13_val))
-                {
-                    AssertFatal(0,
-                                "Failed to parse eNB configuration file %s, enb %d  si_WindowLength_BR_r13, si_RepetitionPattern_r13, fdd_DownlinkOrTddSubframeBitmapBR_r13, fdd_UplinkSubframeBitmapBR_r13!\n",
-                                RC.config_file_name, i);
+		      {
+			AssertFatal(0,
+				    "Failed to parse eNB configuration file %s, enb %d  si_WindowLength_BR_r13, si_RepetitionPattern_r13, fdd_DownlinkOrTddSubframeBitmapBR_r13, fdd_UplinkSubframeBitmapBR_r13!\n",
+				    RC.config_file_name, i);
 
-                }
-                if (!strcmp(interval_DLHoppingConfigCommonModeA_r13, "interval-TDD-r13"))
-                    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13[j] = FALSE;
-                else
-                    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13[j] = TRUE;
-                RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13_val[j] = interval_DLHoppingConfigCommonModeA_r13_val;
+		      }
+		    if (!strcmp(interval_DLHoppingConfigCommonModeA_r13, "interval-TDD-r13"))
+		      RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13[j] = FALSE;
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13[j] = TRUE;
+		    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeA_r13_val[j] = interval_DLHoppingConfigCommonModeA_r13_val;
 
-                if (!strcmp(interval_DLHoppingConfigCommonModeB_r13, "interval-TDD-r13"))
-                    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13[j] = FALSE;
-                else
-                    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13[j] = TRUE;
-                RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13_val[j] = interval_DLHoppingConfigCommonModeB_r13_val;
+		    if (!strcmp(interval_DLHoppingConfigCommonModeB_r13, "interval-TDD-r13"))
+		      RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13[j] = FALSE;
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13[j] = TRUE;
+		    RRC_CONFIGURATION_REQ(msg_p).interval_DLHoppingConfigCommonModeB_r13_val[j] = interval_DLHoppingConfigCommonModeB_r13_val;
 
 
 
 
-            if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPINGNB, &mpdcch_pdsch_HoppingNB_r13))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = calloc(1, sizeof(long));
-                *RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = mpdcch_pdsch_HoppingNB_r13;
+		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPINGNB, &mpdcch_pdsch_HoppingNB_r13))
+		      {
+			RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = calloc(1, sizeof(long));
+			*RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = mpdcch_pdsch_HoppingNB_r13;
 
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = NULL;
+		      }
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingNB_r13[j] = NULL;
 
-            if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPINGOFFSET, &mpdcch_pdsch_HoppingOffset_r13))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = calloc(1, sizeof(long));
-                *RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = mpdcch_pdsch_HoppingOffset_r13;
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = NULL;
+		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPINGOFFSET, &mpdcch_pdsch_HoppingOffset_r13))
+		      {
+			RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = calloc(1, sizeof(long));
+			*RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = mpdcch_pdsch_HoppingOffset_r13;
+		      }
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).mpdcch_pdsch_HoppingOffset_r13[j] = NULL;
 
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).freqHoppingParametersDL_r13[j] = FALSE;
+		  }
+		else
+		  RRC_CONFIGURATION_REQ(msg_p).freqHoppingParametersDL_r13[j] = FALSE;
 
-            /////SIB2 Parameters
+		/////SIB2 Parameters
 
-            if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PREAMBLETRANSMAX_CE_R13, &preambleTransMax_CE_r13))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = calloc(1, sizeof(long));
-                *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = preambleTransMax_CE_r13;
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = NULL;
+		if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PREAMBLETRANSMAX_CE_R13, &preambleTransMax_CE_r13))
+		  {
+		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = calloc(1, sizeof(long));
+		    *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = preambleTransMax_CE_r13;
+		  }
+		else
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].preambleTransMax_CE_r13 = NULL;
 
-            if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PRACH_CONFIGCOMMON_V1310, &prach_ConfigCommon_v1310) && !strcmp(prach_ConfigCommon_v1310, "ENABLE"))
-            {
-                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_ConfigCommon_v1310 = TRUE;
+		if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_PRACH_CONFIGCOMMON_V1310, &prach_ConfigCommon_v1310) && !strcmp(prach_ConfigCommon_v1310, "ENABLE"))
+		  {
+		    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_ConfigCommon_v1310 = TRUE;
 
-                if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_MPDCCH_STARTSF_CSS_RA_R13, &mpdcch_startSF_CSS_RA_r13))
-                {
-                    if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_STARTSF_CSS_RA_R13_VAL, &mpdcch_startSF_CSS_RA_r13_val))
-                    {
-                        AssertFatal(0,
-                                    "Failed to parse eNB configuration file %s, enb %d mpdcch_startSF_CSS_RA_r13_val!\n",
-                                    RC.config_file_name, i);
+		    if (config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_MPDCCH_STARTSF_CSS_RA_R13, &mpdcch_startSF_CSS_RA_r13))
+		      {
+			if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_MPDCCH_STARTSF_CSS_RA_R13_VAL, &mpdcch_startSF_CSS_RA_r13_val))
+			  {
+			    AssertFatal(0,
+					"Failed to parse eNB configuration file %s, enb %d mpdcch_startSF_CSS_RA_r13_val!\n",
+					RC.config_file_name, i);
 
-                    }
-                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = calloc(1, sizeof(BOOLEAN_t));
-                    if (!strcmp(mpdcch_startSF_CSS_RA_r13, "tdd-r13"))
-                        *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = FALSE;
-                    else
-                        *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = TRUE;
+			  }
+			RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = calloc(1, sizeof(BOOLEAN_t));
+			if (!strcmp(mpdcch_startSF_CSS_RA_r13, "tdd-r13"))
+			  *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = FALSE;
+			else
+			  *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = TRUE;
 
-                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13_val = mpdcch_startSF_CSS_RA_r13_val;
+			RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13_val = mpdcch_startSF_CSS_RA_r13_val;
 
-                }
-                else
-                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = NULL;
+		      }
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].mpdcch_startSF_CSS_RA_r13 = NULL;
 
-                if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_HOPPINGOFFSET_R13, &prach_HoppingOffset_r13))
-                {
-                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = calloc(1, sizeof(long));
-                    *RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = prach_HoppingOffset_r13;
+		    if (config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_PRACH_HOPPINGOFFSET_R13, &prach_HoppingOffset_r13))
+		      {
+			RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = calloc(1, sizeof(long));
+			*RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = prach_HoppingOffset_r13;
 
-                }
-                else
-                    RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = NULL;
+		      }
+		    else
+		      RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_HoppingOffset_r13 = NULL;
 
-            }
-            else
-                RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_ConfigCommon_v1310 = TRUE;
-        }
-        else
-        RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j] = 0;
-      }
+		  }
+		else
+		  RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig_BR[j].prach_ConfigCommon_v1310 = TRUE;
+	      }
+	      else
+		RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j] = 0;
+	    }
 #endif
-        }
-
-
-        setting_srb1 = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SRB1);
-
-        if (setting_srb1 != NULL) {
-          if (!(config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_POLL_RETRANSMIT, &srb1_timer_poll_retransmit)
-            && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_REORDERING,      &srb1_timer_reordering)
-            && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_STATUS_PROHIBIT, &srb1_timer_status_prohibit)
-            && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_MAX_RETX_THRESHOLD,    &srb1_max_retx_threshold)
-            && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_POLL_PDU,              &srb1_poll_pdu)
-            && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_POLL_BYTE,             &srb1_poll_byte)))
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d  timer_poll_retransmit, timer_reordering, "
-                 "timer_status_prohibit, poll_pdu, poll_byte, max_retx_threshold !\n",
-                 RC.config_file_name, i);
-
-          switch (srb1_max_retx_threshold) {
-          case 1:
-        rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t1;
-        break;
-
-          case 2:
-        rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t2;
-        break;
-
-          case 3:
-        rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t3;
-        break;
-
-          case 4:
-        rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t4;
-        break;
-
-          case 6:
-        rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t6;
-        break;
-
-          case 8:
-        rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t8;
-        break;
-
-          case 16:
-        rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t16;
-        break;
-
-          case 32:
-        rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t32;
-        break;
-
-          default:
-        AssertFatal (0,
-                 "Bad config value when parsing eNB configuration file %s, enb %d  srb1_max_retx_threshold %u!\n",
-                 RC.config_file_name, i, srb1_max_retx_threshold);
-          }
-
-
-          switch (srb1_poll_pdu) {
-          case 4:
-        rrc->srb1_poll_pdu = PollPDU_p4;
-        break;
-
-          case 8:
-        rrc->srb1_poll_pdu = PollPDU_p8;
-        break;
-
-          case 16:
-        rrc->srb1_poll_pdu = PollPDU_p16;
-        break;
-
-          case 32:
-        rrc->srb1_poll_pdu = PollPDU_p32;
-        break;
-
-          case 64:
-        rrc->srb1_poll_pdu = PollPDU_p64;
-        break;
-
-          case 128:
-        rrc->srb1_poll_pdu = PollPDU_p128;
-        break;
-
-          case 256:
-        rrc->srb1_poll_pdu = PollPDU_p256;
-        break;
-
-          default:
-        if (srb1_poll_pdu >= 10000)
-          rrc->srb1_poll_pdu = PollPDU_pInfinity;
-        else
-          AssertFatal (0,
-                   "Bad config value when parsing eNB configuration file %s, enb %d  srb1_poll_pdu %u!\n",
-                   RC.config_file_name, i, srb1_poll_pdu);
-          }
-
-          rrc->srb1_poll_byte             = srb1_poll_byte;
-
-          switch (srb1_poll_byte) {
-          case 25:
-        rrc->srb1_poll_byte = PollByte_kB25;
-        break;
-
-          case 50:
-        rrc->srb1_poll_byte = PollByte_kB50;
-        break;
-
-          case 75:
-        rrc->srb1_poll_byte = PollByte_kB75;
-        break;
-
-          case 100:
-        rrc->srb1_poll_byte = PollByte_kB100;
-        break;
-
-          case 125:
-        rrc->srb1_poll_byte = PollByte_kB125;
-        break;
-
-          case 250:
-        rrc->srb1_poll_byte = PollByte_kB250;
-        break;
-
-          case 375:
-        rrc->srb1_poll_byte = PollByte_kB375;
-        break;
-
-          case 500:
-        rrc->srb1_poll_byte = PollByte_kB500;
-        break;
-
-          case 750:
-        rrc->srb1_poll_byte = PollByte_kB750;
-        break;
-
-          case 1000:
-        rrc->srb1_poll_byte = PollByte_kB1000;
-        break;
-
-          case 1250:
-        rrc->srb1_poll_byte = PollByte_kB1250;
-        break;
-
-          case 1500:
-        rrc->srb1_poll_byte = PollByte_kB1500;
-        break;
-
-          case 2000:
-        rrc->srb1_poll_byte = PollByte_kB2000;
-        break;
-
-          case 3000:
-        rrc->srb1_poll_byte = PollByte_kB3000;
-        break;
-
-          default:
-        if (srb1_poll_byte >= 10000)
-          rrc->srb1_poll_byte = PollByte_kBinfinity;
-        else
-          AssertFatal (0,
-                   "Bad config value when parsing eNB configuration file %s, enb %d  srb1_poll_byte %u!\n",
-                   RC.config_file_name, i, srb1_poll_byte);
-          }
-
-          if (srb1_timer_poll_retransmit <= 250) {
-        rrc->srb1_timer_poll_retransmit = (srb1_timer_poll_retransmit - 5) / 5;
-          }
-          else if (srb1_timer_poll_retransmit <= 500) {
-        rrc->srb1_timer_poll_retransmit = (srb1_timer_poll_retransmit - 300) / 50 + 50;
-          }
-          else {
-        AssertFatal(0,
-                "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_poll_retransmit %u!\n",
-                RC.config_file_name, i, srb1_timer_poll_retransmit);
-          }
-
-          if (srb1_timer_status_prohibit <= 250) {
-        rrc->srb1_timer_status_prohibit = srb1_timer_status_prohibit / 5;
-          }
-          else if ((srb1_timer_poll_retransmit >= 300) && (srb1_timer_poll_retransmit <= 500)) {
-        rrc->srb1_timer_status_prohibit = (srb1_timer_status_prohibit - 300) / 50 + 51;
-          }
-          else {
-        AssertFatal(0,
-                "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_status_prohibit %u!\n",
-                RC.config_file_name, i, srb1_timer_status_prohibit);
-          }
-
-          switch (srb1_timer_reordering) {
-          case 0:
-        rrc->srb1_timer_reordering = T_Reordering_ms0;
-        break;
-
-          case 5:
-        rrc->srb1_timer_reordering = T_Reordering_ms5;
-        break;
-
-          case 10:
-        rrc->srb1_timer_reordering = T_Reordering_ms10;
-        break;
-
-          case 15:
-        rrc->srb1_timer_reordering = T_Reordering_ms15;
-        break;
-
-          case 20:
-        rrc->srb1_timer_reordering = T_Reordering_ms20;
-        break;
-
-          case 25:
-        rrc->srb1_timer_reordering = T_Reordering_ms25;
-        break;
-
-          case 30:
-        rrc->srb1_timer_reordering = T_Reordering_ms30;
-        break;
-
-          case 35:
-        rrc->srb1_timer_reordering = T_Reordering_ms35;
-        break;
-
-          case 40:
-        rrc->srb1_timer_reordering = T_Reordering_ms40;
-        break;
-
-          case 45:
-        rrc->srb1_timer_reordering = T_Reordering_ms45;
-        break;
-
-          case 50:
-        rrc->srb1_timer_reordering = T_Reordering_ms50;
-        break;
-
-          case 55:
-        rrc->srb1_timer_reordering = T_Reordering_ms55;
-        break;
-
-          case 60:
-        rrc->srb1_timer_reordering = T_Reordering_ms60;
-        break;
-
-          case 65:
-        rrc->srb1_timer_reordering = T_Reordering_ms65;
-        break;
-
-          case 70:
-        rrc->srb1_timer_reordering = T_Reordering_ms70;
-        break;
-
-          case 75:
-        rrc->srb1_timer_reordering = T_Reordering_ms75;
-        break;
-
-          case 80:
-        rrc->srb1_timer_reordering = T_Reordering_ms80;
-        break;
-
-          case 85:
-        rrc->srb1_timer_reordering = T_Reordering_ms85;
-        break;
-
-          case 90:
-        rrc->srb1_timer_reordering = T_Reordering_ms90;
-        break;
-
-          case 95:
-        rrc->srb1_timer_reordering = T_Reordering_ms95;
-        break;
-
-          case 100:
-        rrc->srb1_timer_reordering = T_Reordering_ms100;
-        break;
-
-          case 110:
-        rrc->srb1_timer_reordering = T_Reordering_ms110;
-        break;
-
-          case 120:
-        rrc->srb1_timer_reordering = T_Reordering_ms120;
-        break;
-
-          case 130:
-        rrc->srb1_timer_reordering = T_Reordering_ms130;
-        break;
-
-          case 140:
-        rrc->srb1_timer_reordering = T_Reordering_ms140;
-        break;
-
-          case 150:
-        rrc->srb1_timer_reordering = T_Reordering_ms150;
-        break;
-
-          case 160:
-        rrc->srb1_timer_reordering = T_Reordering_ms160;
-        break;
-
-          case 170:
-        rrc->srb1_timer_reordering = T_Reordering_ms170;
-        break;
-
-          case 180:
-        rrc->srb1_timer_reordering = T_Reordering_ms180;
-        break;
-
-          case 190:
-        rrc->srb1_timer_reordering = T_Reordering_ms190;
-        break;
-
-          case 200:
-        rrc->srb1_timer_reordering = T_Reordering_ms200;
-        break;
-
-          default:
-        AssertFatal (0,
-                 "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_reordering %u!\n",
-                 RC.config_file_name, i, srb1_timer_reordering);
-          }
-
-        }
-        else {
-          rrc->srb1_timer_poll_retransmit = T_PollRetransmit_ms80;
-          rrc->srb1_timer_reordering = T_Reordering_ms35;
-          rrc->srb1_timer_status_prohibit = T_StatusProhibit_ms0;
-          rrc->srb1_poll_pdu = PollPDU_p4;
-          rrc->srb1_poll_byte             = PollByte_kBinfinity;
-          rrc->srb1_max_retx_threshold    = UL_AM_RLC__maxRetxThreshold_t8;
-        }
-        /*
-        // Network Controller
-        subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_CONTROLLER_CONFIG);
-
-        if (subsetting != NULL) {
-        if (  (
-        config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_FLEXRAN_AGENT_INTERFACE_NAME,
-        (const char **)&flexran_agent_interface_name)
-        && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_FLEXRAN_AGENT_IPV4_ADDRESS,
-        (const char **)&flexran_agent_ipv4_address)
-        && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_FLEXRAN_AGENT_PORT,
-        &flexran_agent_port)
-        && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_FLEXRAN_AGENT_CACHE,
-        (const char **)&flexran_agent_cache)
-        )
-        ) {
-        enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_interface_name = strdup(flexran_agent_interface_name);
-        cidr = flexran_agent_ipv4_address;
-        address = strtok(cidr, "/");
-        //enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_ipv4_address = strdup(address);
-        if (address) {
-        IPV4_STR_ADDR_TO_INT_NWBO (address, enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_ipv4_address, "BAD IP ADDRESS FORMAT FOR eNB Agent !\n" );
-        }
-
-        enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_port = flexran_agent_port;
-        enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_cache = strdup(flexran_agent_cache);
-        }
-        }
-        */
-
-        /*
-        // OTG _CONFIG
-        setting_otg = config_setting_get_member (setting_enb, ENB_CONF_STRING_OTG_CONFIG);
-
-        if (setting_otg != NULL) {
-        num_otg_elements  = config_setting_length(setting_otg);
-        printf("num otg elements %d \n", num_otg_elements);
-        enb_properties_loc.properties[enb_properties_loc_index]->num_otg_elements = 0;
-
-        for (j = 0; j < num_otg_elements; j++) {
-        subsetting_otg=config_setting_get_elem(setting_otg, j);
-
-        if (config_setting_lookup_int(subsetting_otg, ENB_CONF_STRING_OTG_UE_ID, &otg_ue_id)) {
-        enb_properties_loc.properties[enb_properties_loc_index]->otg_ue_id[j] = otg_ue_id;
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->otg_ue_id[j] = 1;
-        }
-
-        if (config_setting_lookup_string(subsetting_otg, ENB_CONF_STRING_OTG_APP_TYPE, (const char **)&otg_app_type)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->otg_app_type[j] = map_str_to_int(otg_app_type_names,otg_app_type))== -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->otg_app_type[j] = BCBR;
-        }
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->otg_app_type[j] = NO_PREDEFINED_TRAFFIC; // 0
-        }
-
-        if (config_setting_lookup_string(subsetting_otg, ENB_CONF_STRING_OTG_BG_TRAFFIC, (const char **)&otg_bg_traffic)) {
-
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->otg_bg_traffic[j] = map_str_to_int(switch_names,otg_bg_traffic)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->otg_bg_traffic[j]=0;
-        }
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->otg_bg_traffic[j] = 0;
-        printf("otg bg %s\n", otg_bg_traffic);
-        }
-
-        enb_properties_loc.properties[enb_properties_loc_index]->num_otg_elements+=1;
-
-        }
-        }
-
-        // log_config
-        subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_LOG_CONFIG);
-
-        if (subsetting != NULL) {
-        // global
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_GLOBAL_LOG_LEVEL, (const char **)  &glog_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->glog_level = map_str_to_int(log_level_names, glog_level)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->glog_level = LOG_INFO;
-        }
-
-        //printf( "\tGlobal log level :\t%s->%d\n",glog_level, enb_properties_loc.properties[enb_properties_loc_index]->glog_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->glog_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_GLOBAL_LOG_VERBOSITY,(const char **)  &glog_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity = map_str_to_int(log_verbosity_names, glog_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity = LOG_MED;
-        }
-
-        //printf( "\tGlobal log verbosity:\t%s->%d\n",glog_verbosity, enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity = LOG_MED;
-        }
-
-        // HW
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_HW_LOG_LEVEL, (const char **) &hw_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level = map_str_to_int(log_level_names,hw_log_level)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level = LOG_INFO;
-        }
-
-        //printf( "\tHW log level :\t%s->%d\n",hw_log_level,enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_HW_LOG_VERBOSITY, (const char **) &hw_log_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity = map_str_to_int(log_verbosity_names,hw_log_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity = LOG_MED;
-        }
-
-        //printf( "\tHW log verbosity:\t%s->%d\n",hw_log_verbosity, enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity = LOG_MED;
-        }
-
-        // phy
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_PHY_LOG_LEVEL,(const char **) &phy_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level = map_str_to_int(log_level_names,phy_log_level)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level = LOG_INFO;
-        }
-
-        //printf( "\tPHY log level :\t%s->%d\n",phy_log_level,enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_PHY_LOG_VERBOSITY, (const char **)&phy_log_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity = map_str_to_int(log_verbosity_names,phy_log_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity = LOG_MED;
-        }
-
-        //printf( "\tPHY log verbosity:\t%s->%d\n",phy_log_level,enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity = LOG_MED;
-        }
-
-        //mac
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_MAC_LOG_LEVEL, (const char **)&mac_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level = map_str_to_int(log_level_names,mac_log_level)) == -1 ) {
-        enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level = LOG_INFO;
-        }
-
-        //printf( "\tMAC log level :\t%s->%d\n",mac_log_level,enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_MAC_LOG_VERBOSITY, (const char **)&mac_log_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity = map_str_to_int(log_verbosity_names,mac_log_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity = LOG_MED;
-        }
-
-        //printf( "\tMAC log verbosity:\t%s->%d\n",mac_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity = LOG_MED;
-        }
-
-        //rlc
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_RLC_LOG_LEVEL, (const char **)&rlc_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level = map_str_to_int(log_level_names,rlc_log_level)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level = LOG_INFO;
-        }
-
-        //printf( "\tRLC log level :\t%s->%d\n",rlc_log_level, enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_RLC_LOG_VERBOSITY, (const char **)&rlc_log_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity = map_str_to_int(log_verbosity_names,rlc_log_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity = LOG_MED;
-        }
-
-        //printf( "\tRLC log verbosity:\t%s->%d\n",rlc_log_verbosity, enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity = LOG_MED;
-        }
-
-        //pdcp
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_PDCP_LOG_LEVEL, (const char **)&pdcp_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level = map_str_to_int(log_level_names,pdcp_log_level)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level = LOG_INFO;
-        }
-
-        //printf( "\tPDCP log level :\t%s->%d\n",pdcp_log_level, enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_PDCP_LOG_VERBOSITY, (const char **)&pdcp_log_verbosity)) {
-        enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_verbosity = map_str_to_int(log_verbosity_names,pdcp_log_verbosity);
-        //printf( "\tPDCP log verbosity:\t%s->%d\n",pdcp_log_verbosity, enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_verbosity = LOG_MED;
-        }
-
-        //rrc
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_RRC_LOG_LEVEL, (const char **)&rrc_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level = map_str_to_int(log_level_names,rrc_log_level)) == -1 ) {
-        enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level = LOG_INFO;
-        }
-
-        //printf( "\tRRC log level :\t%s->%d\n",rrc_log_level,enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_RRC_LOG_VERBOSITY, (const char **)&rrc_log_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity = map_str_to_int(log_verbosity_names,rrc_log_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity = LOG_MED;
-        }
-
-        //printf( "\tRRC log verbosity:\t%s->%d\n",rrc_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity = LOG_MED;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_GTPU_LOG_LEVEL, (const char **)&gtpu_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level = map_str_to_int(log_level_names,gtpu_log_level)) == -1 ) {
-        enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level = LOG_INFO;
-        }
-
-        //printf( "\tGTPU log level :\t%s->%d\n",gtpu_log_level,enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_GTPU_LOG_VERBOSITY, (const char **)&gtpu_log_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity = map_str_to_int(log_verbosity_names,gtpu_log_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity = LOG_MED;
-        }
-
-        //printf( "\tGTPU log verbosity:\t%s->%d\n",gtpu_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity = LOG_MED;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_UDP_LOG_LEVEL, (const char **)&udp_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level = map_str_to_int(log_level_names,udp_log_level)) == -1 ) {
-        enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level = LOG_INFO;
-        }
-
-        //printf( "\tUDP log level :\t%s->%d\n",udp_log_level,enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_UDP_LOG_VERBOSITY, (const char **)&udp_log_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->udp_log_verbosity = map_str_to_int(log_verbosity_names,udp_log_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->udp_log_verbosity = LOG_MED;
-        }
-
-        //printf( "\tUDP log verbosity:\t%s->%d\n",udp_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->udp_log_verbosity = LOG_MED;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_OSA_LOG_LEVEL, (const char **)&osa_log_level)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level = map_str_to_int(log_level_names,osa_log_level)) == -1 ) {
-        enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level = LOG_INFO;
-        }
-
-        //printf( "\tOSA log level :\t%s->%d\n",osa_log_level,enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level = LOG_INFO;
-        }
-
-        if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_OSA_LOG_VERBOSITY, (const char **)&osa_log_verbosity)) {
-        if ((enb_properties_loc.properties[enb_properties_loc_index]->osa_log_verbosity = map_str_to_int(log_verbosity_names,osa_log_verbosity)) == -1) {
-        enb_properties_loc.properties[enb_properties_loc_index]->osa_log_verbosity = LOG_MED;
-        }
-
-        //printf( "\tOSA log verbosity:\t%s->%d\n",osa_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->gosa_log_verbosity);
-        } else {
-        enb_properties_loc.properties[enb_properties_loc_index]->osa_log_verbosity = LOG_MED;
-        }
-
-        } else { // not configuration is given
-        enb_properties_loc.properties[enb_properties_loc_index]->glog_level         = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity     = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level       = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity   = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level      = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity  = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level      = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity  = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level      = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity  = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level     = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_verbosity = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level      = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity  = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level     = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level      = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->udp_log_verbosity  = LOG_MED;
-        enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level      = LOG_INFO;
-        enb_properties_loc.properties[enb_properties_loc_index]->osa_log_verbosity  = LOG_MED;
-        }
-        */
-        break;
-      }
-    }
+	  }
+
+
+	  setting_srb1 = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SRB1);
+
+	  if (setting_srb1 != NULL) {
+	    if (!(config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_POLL_RETRANSMIT, &srb1_timer_poll_retransmit)
+		  && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_REORDERING,      &srb1_timer_reordering)
+		  && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_TIMER_STATUS_PROHIBIT, &srb1_timer_status_prohibit)
+		  && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_MAX_RETX_THRESHOLD,    &srb1_max_retx_threshold)
+		  && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_POLL_PDU,              &srb1_poll_pdu)
+		  && config_setting_lookup_int(setting_srb1, ENB_CONFIG_STRING_SRB1_POLL_BYTE,             &srb1_poll_byte)))
+	      AssertFatal (0,
+			   "Failed to parse eNB configuration file %s, enb %d  timer_poll_retransmit, timer_reordering, "
+			   "timer_status_prohibit, poll_pdu, poll_byte, max_retx_threshold !\n",
+			   RC.config_file_name, i);
+
+	    switch (srb1_max_retx_threshold) {
+	    case 1:
+	      rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t1;
+	      break;
+
+	    case 2:
+	      rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t2;
+	      break;
+
+	    case 3:
+	      rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t3;
+	      break;
+
+	    case 4:
+	      rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t4;
+	      break;
+
+	    case 6:
+	      rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t6;
+	      break;
+
+	    case 8:
+	      rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t8;
+	      break;
+
+	    case 16:
+	      rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t16;
+	      break;
+
+	    case 32:
+	      rrc->srb1_max_retx_threshold = UL_AM_RLC__maxRetxThreshold_t32;
+	      break;
+
+	    default:
+	      AssertFatal (0,
+			   "Bad config value when parsing eNB configuration file %s, enb %d  srb1_max_retx_threshold %u!\n",
+			   RC.config_file_name, i, srb1_max_retx_threshold);
+	    }
+
+
+	    switch (srb1_poll_pdu) {
+	    case 4:
+	      rrc->srb1_poll_pdu = PollPDU_p4;
+	      break;
+
+	    case 8:
+	      rrc->srb1_poll_pdu = PollPDU_p8;
+	      break;
+
+	    case 16:
+	      rrc->srb1_poll_pdu = PollPDU_p16;
+	      break;
+
+	    case 32:
+	      rrc->srb1_poll_pdu = PollPDU_p32;
+	      break;
+
+	    case 64:
+	      rrc->srb1_poll_pdu = PollPDU_p64;
+	      break;
+
+	    case 128:
+	      rrc->srb1_poll_pdu = PollPDU_p128;
+	      break;
+
+	    case 256:
+	      rrc->srb1_poll_pdu = PollPDU_p256;
+	      break;
+
+	    default:
+	      if (srb1_poll_pdu >= 10000)
+		rrc->srb1_poll_pdu = PollPDU_pInfinity;
+	      else
+		AssertFatal (0,
+			     "Bad config value when parsing eNB configuration file %s, enb %d  srb1_poll_pdu %u!\n",
+			     RC.config_file_name, i, srb1_poll_pdu);
+	    }
+
+	    rrc->srb1_poll_byte             = srb1_poll_byte;
+
+	    switch (srb1_poll_byte) {
+	    case 25:
+	      rrc->srb1_poll_byte = PollByte_kB25;
+	      break;
+
+	    case 50:
+	      rrc->srb1_poll_byte = PollByte_kB50;
+	      break;
+
+	    case 75:
+	      rrc->srb1_poll_byte = PollByte_kB75;
+	      break;
+
+	    case 100:
+	      rrc->srb1_poll_byte = PollByte_kB100;
+	      break;
+
+	    case 125:
+	      rrc->srb1_poll_byte = PollByte_kB125;
+	      break;
+
+	    case 250:
+	      rrc->srb1_poll_byte = PollByte_kB250;
+	      break;
+
+	    case 375:
+	      rrc->srb1_poll_byte = PollByte_kB375;
+	      break;
+
+	    case 500:
+	      rrc->srb1_poll_byte = PollByte_kB500;
+	      break;
+
+	    case 750:
+	      rrc->srb1_poll_byte = PollByte_kB750;
+	      break;
+
+	    case 1000:
+	      rrc->srb1_poll_byte = PollByte_kB1000;
+	      break;
+
+	    case 1250:
+	      rrc->srb1_poll_byte = PollByte_kB1250;
+	      break;
+
+	    case 1500:
+	      rrc->srb1_poll_byte = PollByte_kB1500;
+	      break;
+
+	    case 2000:
+	      rrc->srb1_poll_byte = PollByte_kB2000;
+	      break;
+
+	    case 3000:
+	      rrc->srb1_poll_byte = PollByte_kB3000;
+	      break;
+
+	    default:
+	      if (srb1_poll_byte >= 10000)
+		rrc->srb1_poll_byte = PollByte_kBinfinity;
+	      else
+		AssertFatal (0,
+			     "Bad config value when parsing eNB configuration file %s, enb %d  srb1_poll_byte %u!\n",
+			     RC.config_file_name, i, srb1_poll_byte);
+	    }
+
+	    if (srb1_timer_poll_retransmit <= 250) {
+	      rrc->srb1_timer_poll_retransmit = (srb1_timer_poll_retransmit - 5) / 5;
+	    }
+	    else if (srb1_timer_poll_retransmit <= 500) {
+	      rrc->srb1_timer_poll_retransmit = (srb1_timer_poll_retransmit - 300) / 50 + 50;
+	    }
+	    else {
+	      AssertFatal(0,
+			  "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_poll_retransmit %u!\n",
+			  RC.config_file_name, i, srb1_timer_poll_retransmit);
+	    }
+
+	    if (srb1_timer_status_prohibit <= 250) {
+	      rrc->srb1_timer_status_prohibit = srb1_timer_status_prohibit / 5;
+	    }
+	    else if ((srb1_timer_poll_retransmit >= 300) && (srb1_timer_poll_retransmit <= 500)) {
+	      rrc->srb1_timer_status_prohibit = (srb1_timer_status_prohibit - 300) / 50 + 51;
+	    }
+	    else {
+	      AssertFatal(0,
+			  "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_status_prohibit %u!\n",
+			  RC.config_file_name, i, srb1_timer_status_prohibit);
+	    }
+
+	    switch (srb1_timer_reordering) {
+	    case 0:
+	      rrc->srb1_timer_reordering = T_Reordering_ms0;
+	      break;
+
+	    case 5:
+	      rrc->srb1_timer_reordering = T_Reordering_ms5;
+	      break;
+
+	    case 10:
+	      rrc->srb1_timer_reordering = T_Reordering_ms10;
+	      break;
+
+	    case 15:
+	      rrc->srb1_timer_reordering = T_Reordering_ms15;
+	      break;
+
+	    case 20:
+	      rrc->srb1_timer_reordering = T_Reordering_ms20;
+	      break;
+
+	    case 25:
+	      rrc->srb1_timer_reordering = T_Reordering_ms25;
+	      break;
+
+	    case 30:
+	      rrc->srb1_timer_reordering = T_Reordering_ms30;
+	      break;
+
+	    case 35:
+	      rrc->srb1_timer_reordering = T_Reordering_ms35;
+	      break;
+
+	    case 40:
+	      rrc->srb1_timer_reordering = T_Reordering_ms40;
+	      break;
+
+	    case 45:
+	      rrc->srb1_timer_reordering = T_Reordering_ms45;
+	      break;
+
+	    case 50:
+	      rrc->srb1_timer_reordering = T_Reordering_ms50;
+	      break;
+
+	    case 55:
+	      rrc->srb1_timer_reordering = T_Reordering_ms55;
+	      break;
+
+	    case 60:
+	      rrc->srb1_timer_reordering = T_Reordering_ms60;
+	      break;
+
+	    case 65:
+	      rrc->srb1_timer_reordering = T_Reordering_ms65;
+	      break;
+
+	    case 70:
+	      rrc->srb1_timer_reordering = T_Reordering_ms70;
+	      break;
+
+	    case 75:
+	      rrc->srb1_timer_reordering = T_Reordering_ms75;
+	      break;
+
+	    case 80:
+	      rrc->srb1_timer_reordering = T_Reordering_ms80;
+	      break;
+
+	    case 85:
+	      rrc->srb1_timer_reordering = T_Reordering_ms85;
+	      break;
+
+	    case 90:
+	      rrc->srb1_timer_reordering = T_Reordering_ms90;
+	      break;
+
+	    case 95:
+	      rrc->srb1_timer_reordering = T_Reordering_ms95;
+	      break;
+
+	    case 100:
+	      rrc->srb1_timer_reordering = T_Reordering_ms100;
+	      break;
+
+	    case 110:
+	      rrc->srb1_timer_reordering = T_Reordering_ms110;
+	      break;
+
+	    case 120:
+	      rrc->srb1_timer_reordering = T_Reordering_ms120;
+	      break;
+
+	    case 130:
+	      rrc->srb1_timer_reordering = T_Reordering_ms130;
+	      break;
+
+	    case 140:
+	      rrc->srb1_timer_reordering = T_Reordering_ms140;
+	      break;
+
+	    case 150:
+	      rrc->srb1_timer_reordering = T_Reordering_ms150;
+	      break;
+
+	    case 160:
+	      rrc->srb1_timer_reordering = T_Reordering_ms160;
+	      break;
+
+	    case 170:
+	      rrc->srb1_timer_reordering = T_Reordering_ms170;
+	      break;
+
+	    case 180:
+	      rrc->srb1_timer_reordering = T_Reordering_ms180;
+	      break;
+
+	    case 190:
+	      rrc->srb1_timer_reordering = T_Reordering_ms190;
+	      break;
+
+	    case 200:
+	      rrc->srb1_timer_reordering = T_Reordering_ms200;
+	      break;
+
+	    default:
+	      AssertFatal (0,
+			   "Bad config value when parsing eNB configuration file %s, enb %d  srb1_timer_reordering %u!\n",
+			   RC.config_file_name, i, srb1_timer_reordering);
+	    }
+
+	  }
+	  else {
+	    rrc->srb1_timer_poll_retransmit = T_PollRetransmit_ms80;
+	    rrc->srb1_timer_reordering = T_Reordering_ms35;
+	    rrc->srb1_timer_status_prohibit = T_StatusProhibit_ms0;
+	    rrc->srb1_poll_pdu = PollPDU_p4;
+	    rrc->srb1_poll_byte             = PollByte_kBinfinity;
+	    rrc->srb1_max_retx_threshold    = UL_AM_RLC__maxRetxThreshold_t8;
+	  }
+	  /*
+	  // Network Controller
+	  subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_CONTROLLER_CONFIG);
+
+	  if (subsetting != NULL) {
+	  if (  (
+	  config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_FLEXRAN_AGENT_INTERFACE_NAME,
+	  (const char **)&flexran_agent_interface_name)
+	  && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_FLEXRAN_AGENT_IPV4_ADDRESS,
+	  (const char **)&flexran_agent_ipv4_address)
+	  && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_FLEXRAN_AGENT_PORT,
+	  &flexran_agent_port)
+	  && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_FLEXRAN_AGENT_CACHE,
+	  (const char **)&flexran_agent_cache)
+	  )
+	  ) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_interface_name = strdup(flexran_agent_interface_name);
+	  cidr = flexran_agent_ipv4_address;
+	  address = strtok(cidr, "/");
+	  //enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_ipv4_address = strdup(address);
+	  if (address) {
+	  IPV4_STR_ADDR_TO_INT_NWBO (address, enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_ipv4_address, "BAD IP ADDRESS FORMAT FOR eNB Agent !\n" );
+	  }
+
+	  enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_port = flexran_agent_port;
+	  enb_properties_loc.properties[enb_properties_loc_index]->flexran_agent_cache = strdup(flexran_agent_cache);
+	  }
+	  }
+	  */
+
+	  /*
+	  // OTG _CONFIG
+	  setting_otg = config_setting_get_member (setting_enb, ENB_CONF_STRING_OTG_CONFIG);
+
+	  if (setting_otg != NULL) {
+	  num_otg_elements  = config_setting_length(setting_otg);
+	  printf("num otg elements %d \n", num_otg_elements);
+	  enb_properties_loc.properties[enb_properties_loc_index]->num_otg_elements = 0;
+
+	  for (j = 0; j < num_otg_elements; j++) {
+	  subsetting_otg=config_setting_get_elem(setting_otg, j);
+
+	  if (config_setting_lookup_int(subsetting_otg, ENB_CONF_STRING_OTG_UE_ID, &otg_ue_id)) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->otg_ue_id[j] = otg_ue_id;
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->otg_ue_id[j] = 1;
+	  }
+
+	  if (config_setting_lookup_string(subsetting_otg, ENB_CONF_STRING_OTG_APP_TYPE, (const char **)&otg_app_type)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->otg_app_type[j] = map_str_to_int(otg_app_type_names,otg_app_type))== -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->otg_app_type[j] = BCBR;
+	  }
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->otg_app_type[j] = NO_PREDEFINED_TRAFFIC; // 0
+	  }
+
+	  if (config_setting_lookup_string(subsetting_otg, ENB_CONF_STRING_OTG_BG_TRAFFIC, (const char **)&otg_bg_traffic)) {
+
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->otg_bg_traffic[j] = map_str_to_int(switch_names,otg_bg_traffic)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->otg_bg_traffic[j]=0;
+	  }
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->otg_bg_traffic[j] = 0;
+	  printf("otg bg %s\n", otg_bg_traffic);
+	  }
+
+	  enb_properties_loc.properties[enb_properties_loc_index]->num_otg_elements+=1;
+
+	  }
+	  }
+
+	  // log_config
+	  subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_LOG_CONFIG);
+
+	  if (subsetting != NULL) {
+	  // global
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_GLOBAL_LOG_LEVEL, (const char **)  &glog_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->glog_level = map_str_to_int(log_level_names, glog_level)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->glog_level = LOG_INFO;
+	  }
+
+	  //printf( "\tGlobal log level :\t%s->%d\n",glog_level, enb_properties_loc.properties[enb_properties_loc_index]->glog_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->glog_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_GLOBAL_LOG_VERBOSITY,(const char **)  &glog_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity = map_str_to_int(log_verbosity_names, glog_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tGlobal log verbosity:\t%s->%d\n",glog_verbosity, enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity = LOG_MED;
+	  }
+
+	  // HW
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_HW_LOG_LEVEL, (const char **) &hw_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level = map_str_to_int(log_level_names,hw_log_level)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tHW log level :\t%s->%d\n",hw_log_level,enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_HW_LOG_VERBOSITY, (const char **) &hw_log_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity = map_str_to_int(log_verbosity_names,hw_log_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tHW log verbosity:\t%s->%d\n",hw_log_verbosity, enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity = LOG_MED;
+	  }
+
+	  // phy
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_PHY_LOG_LEVEL,(const char **) &phy_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level = map_str_to_int(log_level_names,phy_log_level)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tPHY log level :\t%s->%d\n",phy_log_level,enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_PHY_LOG_VERBOSITY, (const char **)&phy_log_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity = map_str_to_int(log_verbosity_names,phy_log_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tPHY log verbosity:\t%s->%d\n",phy_log_level,enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity = LOG_MED;
+	  }
+
+	  //mac
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_MAC_LOG_LEVEL, (const char **)&mac_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level = map_str_to_int(log_level_names,mac_log_level)) == -1 ) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tMAC log level :\t%s->%d\n",mac_log_level,enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_MAC_LOG_VERBOSITY, (const char **)&mac_log_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity = map_str_to_int(log_verbosity_names,mac_log_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tMAC log verbosity:\t%s->%d\n",mac_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity = LOG_MED;
+	  }
+
+	  //rlc
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_RLC_LOG_LEVEL, (const char **)&rlc_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level = map_str_to_int(log_level_names,rlc_log_level)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tRLC log level :\t%s->%d\n",rlc_log_level, enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_RLC_LOG_VERBOSITY, (const char **)&rlc_log_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity = map_str_to_int(log_verbosity_names,rlc_log_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tRLC log verbosity:\t%s->%d\n",rlc_log_verbosity, enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity = LOG_MED;
+	  }
+
+	  //pdcp
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_PDCP_LOG_LEVEL, (const char **)&pdcp_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level = map_str_to_int(log_level_names,pdcp_log_level)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tPDCP log level :\t%s->%d\n",pdcp_log_level, enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_PDCP_LOG_VERBOSITY, (const char **)&pdcp_log_verbosity)) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_verbosity = map_str_to_int(log_verbosity_names,pdcp_log_verbosity);
+	  //printf( "\tPDCP log verbosity:\t%s->%d\n",pdcp_log_verbosity, enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_verbosity = LOG_MED;
+	  }
+
+	  //rrc
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_RRC_LOG_LEVEL, (const char **)&rrc_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level = map_str_to_int(log_level_names,rrc_log_level)) == -1 ) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tRRC log level :\t%s->%d\n",rrc_log_level,enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_RRC_LOG_VERBOSITY, (const char **)&rrc_log_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity = map_str_to_int(log_verbosity_names,rrc_log_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tRRC log verbosity:\t%s->%d\n",rrc_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity = LOG_MED;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_GTPU_LOG_LEVEL, (const char **)&gtpu_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level = map_str_to_int(log_level_names,gtpu_log_level)) == -1 ) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tGTPU log level :\t%s->%d\n",gtpu_log_level,enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_GTPU_LOG_VERBOSITY, (const char **)&gtpu_log_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity = map_str_to_int(log_verbosity_names,gtpu_log_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tGTPU log verbosity:\t%s->%d\n",gtpu_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity = LOG_MED;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_UDP_LOG_LEVEL, (const char **)&udp_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level = map_str_to_int(log_level_names,udp_log_level)) == -1 ) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tUDP log level :\t%s->%d\n",udp_log_level,enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_UDP_LOG_VERBOSITY, (const char **)&udp_log_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->udp_log_verbosity = map_str_to_int(log_verbosity_names,udp_log_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->udp_log_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tUDP log verbosity:\t%s->%d\n",udp_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->udp_log_verbosity = LOG_MED;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_OSA_LOG_LEVEL, (const char **)&osa_log_level)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level = map_str_to_int(log_level_names,osa_log_level)) == -1 ) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level = LOG_INFO;
+	  }
+
+	  //printf( "\tOSA log level :\t%s->%d\n",osa_log_level,enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level = LOG_INFO;
+	  }
+
+	  if (config_setting_lookup_string(subsetting, ENB_CONFIG_STRING_OSA_LOG_VERBOSITY, (const char **)&osa_log_verbosity)) {
+	  if ((enb_properties_loc.properties[enb_properties_loc_index]->osa_log_verbosity = map_str_to_int(log_verbosity_names,osa_log_verbosity)) == -1) {
+	  enb_properties_loc.properties[enb_properties_loc_index]->osa_log_verbosity = LOG_MED;
+	  }
+
+	  //printf( "\tOSA log verbosity:\t%s->%d\n",osa_log_verbosity,enb_properties_loc.properties[enb_properties_loc_index]->gosa_log_verbosity);
+	  } else {
+	  enb_properties_loc.properties[enb_properties_loc_index]->osa_log_verbosity = LOG_MED;
+	  }
+
+	  } else { // not configuration is given
+	  enb_properties_loc.properties[enb_properties_loc_index]->glog_level         = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->glog_verbosity     = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->hw_log_level       = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->hw_log_verbosity   = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->phy_log_level      = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->phy_log_verbosity  = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->mac_log_level      = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->mac_log_verbosity  = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_level      = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->rlc_log_verbosity  = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_level     = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->pdcp_log_verbosity = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_level      = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->rrc_log_verbosity  = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_level     = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->gtpu_log_verbosity = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->udp_log_level      = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->udp_log_verbosity  = LOG_MED;
+	  enb_properties_loc.properties[enb_properties_loc_index]->osa_log_level      = LOG_INFO;
+	  enb_properties_loc.properties[enb_properties_loc_index]->osa_log_verbosity  = LOG_MED;
+	  }
+	  */
+	  break;
+	}
       }
     }
   }
+}
 
-  int RCconfig_gtpu() {
-    config_t          cfg;
-    config_setting_t *setting                       = NULL;
-    config_setting_t *subsetting                    = NULL;
-    config_setting_t *setting_enb                   = NULL;
-    int               num_enbs                      = 0;
-    libconfig_int     enb_id                        = 0;
+int RCconfig_gtpu() {
+  config_t          cfg;
+  config_setting_t *setting                       = NULL;
+  config_setting_t *subsetting                    = NULL;
+  config_setting_t *setting_enb                   = NULL;
+  int               num_enbs                      = 0;
+  libconfig_int     enb_id                        = 0;
 
 
 
-    char*             enb_interface_name_for_S1U    = NULL;
-    char*             enb_ipv4_address_for_S1U      = NULL;
-    libconfig_int     enb_port_for_S1U              = 0;
-    char             *address                       = NULL;
-    char             *cidr                          = NULL;
-    char             *astring                       = NULL;
+  char*             enb_interface_name_for_S1U    = NULL;
+  char*             enb_ipv4_address_for_S1U      = NULL;
+  libconfig_int     enb_port_for_S1U              = 0;
+  char             *address                       = NULL;
+  char             *cidr                          = NULL;
+  char             *astring                       = NULL;
 
-    // for no gcc warnings
-    (void)astring;
+  // for no gcc warnings
+  (void)astring;
 
 
-    LOG_I(GTPU,"Configuring GTPu\n");
+  LOG_I(GTPU,"Configuring GTPu\n");
 
-    config_init(&cfg);
+  config_init(&cfg);
 
-    if (RC.config_file_name != NULL) {
-      // Read the file. If there is an error, report it and exit.
-      if (! config_read_file(&cfg, RC.config_file_name)) {
-    config_destroy(&cfg);
-    AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
-      }
-    } else {
+  if (RC.config_file_name != NULL) {
+    // Read the file. If there is an error, report it and exit.
+    if (! config_read_file(&cfg, RC.config_file_name)) {
       config_destroy(&cfg);
-      AssertFatal (0, "No eNB configuration file provided!\n");
+      AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
     }
+  } else {
+    config_destroy(&cfg);
+    AssertFatal (0, "No eNB configuration file provided!\n");
+  }
 
-    // Get list of active eNBs, (only these will be configured)
-    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
+  // Get list of active eNBs, (only these will be configured)
+  setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
+
+  if (setting != NULL) {
+    num_enbs = config_setting_length(setting);
+    setting_enb   = config_setting_get_elem(setting, 0);
+  }
+
+  if (num_enbs>0) {
+    // Output a list of all eNBs.
+    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
 
     if (setting != NULL) {
-      num_enbs = config_setting_length(setting);
-      setting_enb   = config_setting_get_elem(setting, 0);
-    }
-
-    if (num_enbs>0) {
-      // Output a list of all eNBs.
-      setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
-
-      if (setting != NULL) {
 
 
-    setting_enb = config_setting_get_elem(setting, 0);
-    subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
+      setting_enb = config_setting_get_elem(setting, 0);
+      subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
 
-    if (subsetting != NULL) {
-      if (  (config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U,
-                           (const char **)&enb_interface_name_for_S1U)
-         && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U,
-                          (const char **)&enb_ipv4_address_for_S1U)
-         && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_ENB_PORT_FOR_S1U,
-                          &enb_port_for_S1U)
-         )
-        ) {
+      if (subsetting != NULL) {
+	if (  (config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U,
+					     (const char **)&enb_interface_name_for_S1U)
+	       && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U,
+						(const char **)&enb_ipv4_address_for_S1U)
+	       && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_ENB_PORT_FOR_S1U,
+					    &enb_port_for_S1U)
+	       )
+	      ) {
 
-        cidr = enb_ipv4_address_for_S1U;
-        address = strtok(cidr, "/");
+	  cidr = enb_ipv4_address_for_S1U;
+	  address = strtok(cidr, "/");
 
-        if (address) {
-          IPV4_STR_ADDR_TO_INT_NWBO ( address, RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up, "BAD IP ADDRESS FORMAT FOR eNB S1_U !\n" );
+	  if (address) {
+	    IPV4_STR_ADDR_TO_INT_NWBO ( address, RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up, "BAD IP ADDRESS FORMAT FOR eNB S1_U !\n" );
 
-          LOG_I(GTPU,"Configuring GTPu address : %s -> %x\n",address,RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up);
+	    LOG_I(GTPU,"Configuring GTPu address : %s -> %x\n",address,RC.gtpv1u_data_g->enb_ip_address_for_S1u_S12_S4_up);
 
-        }
+	  }
 
-        RC.gtpv1u_data_g->enb_port_for_S1u_S12_S4_up = enb_port_for_S1U;
+	  RC.gtpv1u_data_g->enb_port_for_S1u_S12_S4_up = enb_port_for_S1U;
 
-      }
-    }
+	}
       }
     }
   }
+}
 
 
-  int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
-    config_t          cfg;
-    config_setting_t *setting                       = NULL;
-    config_setting_t *subsetting                    = NULL;
-    config_setting_t *setting_mme_addresses         = NULL;
-    config_setting_t *setting_mme_address           = NULL;
-    config_setting_t *setting_enb                   = NULL;
-    config_setting_t *setting_otg                   = NULL;
-    config_setting_t *subsetting_otg                = NULL;
-    int               parse_errors                  = 0;
-    int               num_enbs                      = 0;
-    int               num_mme_address               = 0;
-    int               num_otg_elements              = 0;
-    int               num_component_carriers        = 0;
-    int               j                             = 0;
-    libconfig_int     enb_id                        = 0;
+int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
+  config_t          cfg;
+  config_setting_t *setting                       = NULL;
+  config_setting_t *subsetting                    = NULL;
+  config_setting_t *setting_mme_addresses         = NULL;
+  config_setting_t *setting_mme_address           = NULL;
+  config_setting_t *setting_enb                   = NULL;
+  config_setting_t *setting_otg                   = NULL;
+  config_setting_t *subsetting_otg                = NULL;
+  int               parse_errors                  = 0;
+  int               num_enbs                      = 0;
+  int               num_mme_address               = 0;
+  int               num_otg_elements              = 0;
+  int               num_component_carriers        = 0;
+  int               j                             = 0;
+  libconfig_int     enb_id                        = 0;
 
 
-    const char*       cell_type                     = NULL;
-    const char*       tac                           = 0;
-    const char*       enb_name                      = NULL;
-    const char*       mcc                           = 0;
-    const char*       mnc                           = 0;
+  const char*       cell_type                     = NULL;
+  const char*       tac                           = 0;
+  const char*       enb_name                      = NULL;
+  const char*       mcc                           = 0;
+  const char*       mnc                           = 0;
 
-    libconfig_int     my_int;
+  libconfig_int     my_int;
 
 
-    char*             if_name                       = NULL;
-    char*             ipv4                          = NULL;
-    char*             ipv4_remote                   = NULL;
-    char*             ipv6                          = NULL;
-    char*             local_rf                      = NULL;
-    char*             preference                    = NULL;
-    char*             active                        = NULL;
+  char*             if_name                       = NULL;
+  char*             ipv4                          = NULL;
+  char*             ipv4_remote                   = NULL;
+  char*             ipv6                          = NULL;
+  char*             local_rf                      = NULL;
+  char*             preference                    = NULL;
+  char*             active                        = NULL;
 
-    char*             tr_preference                 = NULL;
-    libconfig_int     local_port                    = 0;
-    libconfig_int     remote_port                   = 0;
-    const char*       active_enb[MAX_ENB];
-    char*             enb_interface_name_for_S1U    = NULL;
-    char*             enb_ipv4_address_for_S1U      = NULL;
-    libconfig_int     enb_port_for_S1U              = 0;
-    char*             enb_interface_name_for_S1_MME = NULL;
-    char*             enb_ipv4_address_for_S1_MME   = NULL;
-    char             *address                       = NULL;
-    char             *cidr                          = NULL;
-    char             *astring                       = NULL;
+  char*             tr_preference                 = NULL;
+  libconfig_int     local_port                    = 0;
+  libconfig_int     remote_port                   = 0;
+  const char*       active_enb[MAX_ENB];
+  char*             enb_interface_name_for_S1U    = NULL;
+  char*             enb_ipv4_address_for_S1U      = NULL;
+  libconfig_int     enb_port_for_S1U              = 0;
+  char*             enb_interface_name_for_S1_MME = NULL;
+  char*             enb_ipv4_address_for_S1_MME   = NULL;
+  char             *address                       = NULL;
+  char             *cidr                          = NULL;
+  char             *astring                       = NULL;
 
-    // for no gcc warnings
-    (void)astring;
-    (void)my_int;
+  // for no gcc warnings
+  (void)astring;
+  (void)my_int;
 
-    memset((char*)active_enb,     0 , MAX_ENB * sizeof(char*));
+  memset((char*)active_enb,     0 , MAX_ENB * sizeof(char*));
 
-    config_init(&cfg);
+  config_init(&cfg);
 
-    if (RC.config_file_name != NULL) {
-      // Read the file. If there is an error, report it and exit.
-      if (! config_read_file(&cfg, RC.config_file_name)) {
-    config_destroy(&cfg);
-    AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
-      }
-    } else {
+  if (RC.config_file_name != NULL) {
+    // Read the file. If there is an error, report it and exit.
+    if (! config_read_file(&cfg, RC.config_file_name)) {
       config_destroy(&cfg);
-      AssertFatal (0, "No eNB configuration file provided!\n");
+      AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
     }
+  } else {
+    config_destroy(&cfg);
+    AssertFatal (0, "No eNB configuration file provided!\n");
+  }
 
 #if defined(ENABLE_ITTI) && defined(ENABLE_USE_MME)
 
-    if (  (config_lookup_string( &cfg, ENB_CONFIG_STRING_ASN1_VERBOSITY, (const char **)&astring) )) {
-      if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_NONE) == 0) {
-    asn_debug      = 0;
-    asn1_xer_print = 0;
-      } else if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_INFO) == 0) {
-    asn_debug      = 1;
-    asn1_xer_print = 1;
-      } else if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_ANNOYING) == 0) {
-    asn_debug      = 1;
-    asn1_xer_print = 2;
-      } else {
-    asn_debug      = 0;
-    asn1_xer_print = 0;
-      }
+  if (  (config_lookup_string( &cfg, ENB_CONFIG_STRING_ASN1_VERBOSITY, (const char **)&astring) )) {
+    if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_NONE) == 0) {
+      asn_debug      = 0;
+      asn1_xer_print = 0;
+    } else if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_INFO) == 0) {
+      asn_debug      = 1;
+      asn1_xer_print = 1;
+    } else if (strcasecmp(astring , ENB_CONFIG_STRING_ASN1_VERBOSITY_ANNOYING) == 0) {
+      asn_debug      = 1;
+      asn1_xer_print = 2;
+    } else {
+      asn_debug      = 0;
+      asn1_xer_print = 0;
     }
+  }
 
 #endif
 
-    // Get list of active eNBs, (only these will be configured)
-    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
+  // Get list of active eNBs, (only these will be configured)
+  setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
+
+  if (setting != NULL) {
+    num_enbs = config_setting_length(setting);
+    setting_enb   = config_setting_get_elem(setting, i);
+    active_enb[i] = config_setting_get_string (setting_enb);
+    AssertFatal (active_enb[i] != NULL,
+		 "Failed to parse config file %s, %uth attribute %s \n",
+		 RC.config_file_name, i, ENB_CONFIG_STRING_ACTIVE_ENBS);
+    active_enb[i] = strdup(active_enb[i]);
+  }
+
+
+  if (num_enbs>0) {
+    // Output a list of all eNBs.
+    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
 
     if (setting != NULL) {
       num_enbs = config_setting_length(setting);
-      setting_enb   = config_setting_get_elem(setting, i);
-      active_enb[i] = config_setting_get_string (setting_enb);
-      AssertFatal (active_enb[i] != NULL,
-           "Failed to parse config file %s, %uth attribute %s \n",
-           RC.config_file_name, i, ENB_CONFIG_STRING_ACTIVE_ENBS);
-      active_enb[i] = strdup(active_enb[i]);
-    }
 
+      for (i = 0; i < num_enbs; i++) {
+	setting_enb = config_setting_get_elem(setting, i);
 
-    if (num_enbs>0) {
-      // Output a list of all eNBs.
-      setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
-
-      if (setting != NULL) {
-    num_enbs = config_setting_length(setting);
-
-    for (i = 0; i < num_enbs; i++) {
-      setting_enb = config_setting_get_elem(setting, i);
-
-      if (! config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_ENB_ID, &enb_id)) {
-        // Calculate a default eNB ID
+	if (! config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_ENB_ID, &enb_id)) {
+	  // Calculate a default eNB ID
 
 # if defined(ENABLE_USE_MME)
-        uint32_t hash;
+	  uint32_t hash;
 
-        hash = s1ap_generate_eNB_id ();
-        enb_id = i + (hash & 0xFFFF8);
+	  hash = s1ap_generate_eNB_id ();
+	  enb_id = i + (hash & 0xFFFF8);
 # else
-        enb_id = i;
+	  enb_id = i;
 # endif
-      }
+	}
 
-      if (  !(       config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_CELL_TYPE,           &cell_type)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_ENB_NAME,            &enb_name)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRACKING_AREA_CODE,  &tac)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE, &mcc)
-             && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_NETWORK_CODE, &mnc)
+	if (  !(       config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_CELL_TYPE,           &cell_type)
+		       && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_ENB_NAME,            &enb_name)
+		       && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_TRACKING_AREA_CODE,  &tac)
+		       && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE, &mcc)
+		       && config_setting_lookup_string(setting_enb, ENB_CONFIG_STRING_MOBILE_NETWORK_CODE, &mnc)
 
 
-             )
-        ) {
-        AssertFatal (0,
-             "Failed to parse eNB configuration file %s, %u th enb\n",
-             RC.config_file_name, i);
-        continue; // FIXME this prevents segfaults below, not sure what happens after function exit
-      }
+		       )
+	      ) {
+	  AssertFatal (0,
+		       "Failed to parse eNB configuration file %s, %u th enb\n",
+		       RC.config_file_name, i);
+	  continue; // FIXME this prevents segfaults below, not sure what happens after function exit
+	}
 
-      // search if in active list
-      for (j=0; j < num_enbs; j++) {
-        if (strcmp(active_enb[j], enb_name) == 0) {
+	// search if in active list
+	for (j=0; j < num_enbs; j++) {
+	  if (strcmp(active_enb[j], enb_name) == 0) {
 
-          S1AP_REGISTER_ENB_REQ (msg_p).eNB_id = enb_id;
+	    S1AP_REGISTER_ENB_REQ (msg_p).eNB_id = enb_id;
 
-          if (strcmp(cell_type, "CELL_MACRO_ENB") == 0) {
-        S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_ENB;
-          } else  if (strcmp(cell_type, "CELL_HOME_ENB") == 0) {
-        S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_HOME_ENB;
-          } else {
-        AssertFatal (0,
-                 "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n",
-                 RC.config_file_name, i, cell_type);
-          }
+	    if (strcmp(cell_type, "CELL_MACRO_ENB") == 0) {
+	      S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_ENB;
+	    } else  if (strcmp(cell_type, "CELL_HOME_ENB") == 0) {
+	      S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_HOME_ENB;
+	    } else {
+	      AssertFatal (0,
+			   "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n",
+			   RC.config_file_name, i, cell_type);
+	    }
 
-          S1AP_REGISTER_ENB_REQ (msg_p).eNB_name         = strdup(enb_name);
-          S1AP_REGISTER_ENB_REQ (msg_p).tac              = (uint16_t)atoi(tac);
-          S1AP_REGISTER_ENB_REQ (msg_p).mcc              = (uint16_t)atoi(mcc);
-          S1AP_REGISTER_ENB_REQ (msg_p).mnc              = (uint16_t)atoi(mnc);
-          S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length = strlen(mnc);
-          S1AP_REGISTER_ENB_REQ (msg_p).default_drx      = 0;
-          AssertFatal((S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length == 2) ||
-              (S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length == 3),
-              "BAD MNC DIGIT LENGTH %d",
-              S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length);
+	    S1AP_REGISTER_ENB_REQ (msg_p).eNB_name         = strdup(enb_name);
+	    S1AP_REGISTER_ENB_REQ (msg_p).tac              = (uint16_t)atoi(tac);
+	    S1AP_REGISTER_ENB_REQ (msg_p).mcc              = (uint16_t)atoi(mcc);
+	    S1AP_REGISTER_ENB_REQ (msg_p).mnc              = (uint16_t)atoi(mnc);
+	    S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length = strlen(mnc);
+	    S1AP_REGISTER_ENB_REQ (msg_p).default_drx      = 0;
+	    AssertFatal((S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length == 2) ||
+			(S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length == 3),
+			"BAD MNC DIGIT LENGTH %d",
+			S1AP_REGISTER_ENB_REQ (msg_p).mnc_digit_length);
 
 
 
-          setting_mme_addresses = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_MME_IP_ADDRESS);
-          num_mme_address     = config_setting_length(setting_mme_addresses);
-          S1AP_REGISTER_ENB_REQ (msg_p).nb_mme = 0;
+	    setting_mme_addresses = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_MME_IP_ADDRESS);
+	    num_mme_address     = config_setting_length(setting_mme_addresses);
+	    S1AP_REGISTER_ENB_REQ (msg_p).nb_mme = 0;
 
-          for (j = 0; j < num_mme_address; j++) {
-        setting_mme_address = config_setting_get_elem(setting_mme_addresses, j);
+	    for (j = 0; j < num_mme_address; j++) {
+	      setting_mme_address = config_setting_get_elem(setting_mme_addresses, j);
 
-        if (  !(
-            config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IPV4_ADDRESS, (const char **)&ipv4)
-            && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IPV6_ADDRESS, (const char **)&ipv6)
-            && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE, (const char **)&active)
-            && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IP_ADDRESS_PREFERENCE, (const char **)&preference)
-            )
-              ) {
-          AssertFatal (0,
-                   "Failed to parse eNB configuration file %s, %u th enb %u th mme address !\n",
-                   RC.config_file_name, i, j);
-          continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
-        }
+	      if (  !(
+		      config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IPV4_ADDRESS, (const char **)&ipv4)
+		      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IPV6_ADDRESS, (const char **)&ipv6)
+		      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE, (const char **)&active)
+		      && config_setting_lookup_string(setting_mme_address, ENB_CONFIG_STRING_MME_IP_ADDRESS_PREFERENCE, (const char **)&preference)
+		      )
+		    ) {
+		AssertFatal (0,
+			     "Failed to parse eNB configuration file %s, %u th enb %u th mme address !\n",
+			     RC.config_file_name, i, j);
+		continue; // FIXME will prevent segfaults below, not sure what happens at function exit...
+	      }
 
-        S1AP_REGISTER_ENB_REQ (msg_p).nb_mme += 1;
+	      S1AP_REGISTER_ENB_REQ (msg_p).nb_mme += 1;
 
-        strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4_address,ipv4);
-        strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6_address,ipv6);
+	      strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4_address,ipv4);
+	      strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6_address,ipv6);
 
-        if (strcmp(active, "yes") == 0) {
+	      if (strcmp(active, "yes") == 0) {
 #if defined(ENABLE_USE_MME)
-          EPC_MODE_ENABLED = 1;
+		EPC_MODE_ENABLED = 1;
 #endif
-        }
-        if (strcmp(preference, "ipv4") == 0) {
-          S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4 = 1;
-        } else if (strcmp(preference, "ipv6") == 0) {
-          S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6 = 1;
-        } else if (strcmp(preference, "no") == 0) {
-          S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4 = 1;
-          S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6 = 1;
-        }
-          }
+	      }
+	      if (strcmp(preference, "ipv4") == 0) {
+		S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4 = 1;
+	      } else if (strcmp(preference, "ipv6") == 0) {
+		S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6 = 1;
+	      } else if (strcmp(preference, "no") == 0) {
+		S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv4 = 1;
+		S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[j].ipv6 = 1;
+	      }
+	    }
 
 
-          // SCTP SETTING
-          S1AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = SCTP_OUT_STREAMS;
-          S1AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams  = SCTP_IN_STREAMS;
+	    // SCTP SETTING
+	    S1AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = SCTP_OUT_STREAMS;
+	    S1AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams  = SCTP_IN_STREAMS;
 # if defined(ENABLE_USE_MME)
-          subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SCTP_CONFIG);
+	    subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SCTP_CONFIG);
 
-          if (subsetting != NULL) {
-        if ( (config_setting_lookup_int( subsetting, ENB_CONFIG_STRING_SCTP_INSTREAMS, &my_int) )) {
-          S1AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams = (uint16_t)my_int;
-        }
+	    if (subsetting != NULL) {
+	      if ( (config_setting_lookup_int( subsetting, ENB_CONFIG_STRING_SCTP_INSTREAMS, &my_int) )) {
+		S1AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams = (uint16_t)my_int;
+	      }
 
-        if ( (config_setting_lookup_int( subsetting, ENB_CONFIG_STRING_SCTP_OUTSTREAMS, &my_int) )) {
-          S1AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = (uint16_t)my_int;
-        }
-          }
+	      if ( (config_setting_lookup_int( subsetting, ENB_CONFIG_STRING_SCTP_OUTSTREAMS, &my_int) )) {
+		S1AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = (uint16_t)my_int;
+	      }
+	    }
 #endif
 
-          // NETWORK_INTERFACES
-          subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
+	    // NETWORK_INTERFACES
+	    subsetting = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG);
 
-          if (subsetting != NULL) {
-        if (  (
-               config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1_MME,
-                             (const char **)&enb_interface_name_for_S1_MME)
-               && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDRESS_FOR_S1_MME,
-                            (const char **)&enb_ipv4_address_for_S1_MME)
-               && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U,
-                            (const char **)&enb_interface_name_for_S1U)
-               && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U,
-                            (const char **)&enb_ipv4_address_for_S1U)
-               && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_ENB_PORT_FOR_S1U,
-                            &enb_port_for_S1U)
-               )
-              ) {
-          //		S1AP_REGISTER_ENB_REQ (msg_p).enb_interface_name_for_S1U = strdup(enb_interface_name_for_S1U);
-          cidr = enb_ipv4_address_for_S1U;
-          address = strtok(cidr, "/");
+	    if (subsetting != NULL) {
+	      if (  (
+		     config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1_MME,
+						   (const char **)&enb_interface_name_for_S1_MME)
+		     && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDRESS_FOR_S1_MME,
+						      (const char **)&enb_ipv4_address_for_S1_MME)
+		     && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U,
+						      (const char **)&enb_interface_name_for_S1U)
+		     && config_setting_lookup_string( subsetting, ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U,
+						      (const char **)&enb_ipv4_address_for_S1U)
+		     && config_setting_lookup_int(subsetting, ENB_CONFIG_STRING_ENB_PORT_FOR_S1U,
+						  &enb_port_for_S1U)
+		     )
+		    ) {
+		//		S1AP_REGISTER_ENB_REQ (msg_p).enb_interface_name_for_S1U = strdup(enb_interface_name_for_S1U);
+		cidr = enb_ipv4_address_for_S1U;
+		address = strtok(cidr, "/");
 
-          S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv6 = 0;
-          S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4 = 1;
+		S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv6 = 0;
+		S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4 = 1;
 
-          strcpy(S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4_address, address);
+		strcpy(S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4_address, address);
 
-          /*
-            in_addr_t  ipv4_address;
+		/*
+		  in_addr_t  ipv4_address;
 
-            if (address) {
-            IPV4_STR_ADDR_TO_INT_NWBO ( address, ipv4_address, "BAD IP ADDRESS FORMAT FOR eNB S1_U !\n" );
-            }
-            strcpy(S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4_address, inet_ntoa(ipv4_address));
-            //		S1AP_REGISTER_ENB_REQ (msg_p).enb_port_for_S1U = enb_port_for_S1U;
+		  if (address) {
+		  IPV4_STR_ADDR_TO_INT_NWBO ( address, ipv4_address, "BAD IP ADDRESS FORMAT FOR eNB S1_U !\n" );
+		  }
+		  strcpy(S1AP_REGISTER_ENB_REQ (msg_p).enb_ip_address.ipv4_address, inet_ntoa(ipv4_address));
+		  //		S1AP_REGISTER_ENB_REQ (msg_p).enb_port_for_S1U = enb_port_for_S1U;
 
 
-            S1AP_REGISTER_ENB_REQ (msg_p).enb_interface_name_for_S1_MME = strdup(enb_interface_name_for_S1_MME);
-            cidr = enb_ipv4_address_for_S1_MME;
-            address = strtok(cidr, "/");
+		  S1AP_REGISTER_ENB_REQ (msg_p).enb_interface_name_for_S1_MME = strdup(enb_interface_name_for_S1_MME);
+		  cidr = enb_ipv4_address_for_S1_MME;
+		  address = strtok(cidr, "/");
 
-            if (address) {
-            IPV4_STR_ADDR_TO_INT_NWBO ( address, S1AP_REGISTER_ENB_REQ(msg_p).enb_ipv4_address_for_S1_MME, "BAD IP ADDRESS FORMAT FOR eNB S1_MME !\n" );
-            }
-          */
-        }
-          }
+		  if (address) {
+		  IPV4_STR_ADDR_TO_INT_NWBO ( address, S1AP_REGISTER_ENB_REQ(msg_p).enb_ipv4_address_for_S1_MME, "BAD IP ADDRESS FORMAT FOR eNB S1_MME !\n" );
+		  }
+		*/
+	      }
+	    }
 
 
 
 
-          break;
-        }
-      }
-    }
+	    break;
+	  }
+	}
       }
     }
   }
+}
 
-  void RCConfig(const char *config_file_name) {
+void RCConfig(const char *config_file_name) {
 
-    config_t          cfg;
-    config_setting_t *setting                       = NULL;
-    config_setting_t *setting_enb                   = NULL;
-    config_setting_t *setting_component_carriers    = NULL;
-    config_init(&cfg);
+  config_t          cfg;
+  config_setting_t *setting                       = NULL;
+  config_setting_t *setting_enb                   = NULL;
+  config_setting_t *setting_component_carriers    = NULL;
+  config_init(&cfg);
 
-    if (config_file_name != NULL) {
+  if (config_file_name != NULL) {
 
-      RC.config_file_name = config_file_name;
-      if (! config_read_file(&cfg, RC.config_file_name)) {
-    config_destroy(&cfg);
-    AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
-      }
-      // Get num eNB instances
-      setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
-
-      if (setting != NULL) RC.nb_inst = config_setting_length(setting);
-      if (RC.nb_inst > 0) {
-    printf("Number of eNB RRC instances %d\n",RC.nb_inst);
-    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
-    RC.nb_CC = (int *)malloc((1+RC.nb_inst)*sizeof(int));
-    for (int i=0;i<RC.nb_inst;i++) {
-      setting_enb                  = config_setting_get_elem(setting, i);
-      setting_component_carriers   = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_COMPONENT_CARRIERS);
-      AssertFatal(setting_component_carriers != NULL, "No component carrier definitions in %s\n",RC.config_file_name);
-      RC.nb_CC[i]                = config_setting_length(setting_component_carriers);
-      printf("Setting nb_CC to %d for instance %d\n",RC.nb_CC[i],i);
-
-    }
-      }
-
-      // Get num MACRLC instances
-      setting = config_lookup(&cfg, CONFIG_STRING_MACRLC_LIST);
-      if (setting != NULL) RC.nb_macrlc_inst = config_setting_length(setting);
-
-      // Get num L1 instances
-      setting = config_lookup(&cfg, CONFIG_STRING_L1_LIST);
-      if (setting != NULL) RC.nb_L1_inst = config_setting_length(setting);
-
-      // Get num RU instances
-      setting = config_lookup(&cfg, CONFIG_STRING_RU_LIST);
-      if (setting != NULL) RC.nb_RU     = config_setting_length(setting);
-    }
-    else {
+    RC.config_file_name = config_file_name;
+    if (! config_read_file(&cfg, RC.config_file_name)) {
       config_destroy(&cfg);
-      AssertFatal(0,"Configuration file is null\n");
+      AssertFatal (0, "Failed to parse eNB configuration file %s!\n", RC.config_file_name);
+    }
+    // Get num eNB instances
+    setting = config_lookup(&cfg, ENB_CONFIG_STRING_ACTIVE_ENBS);
+
+    if (setting != NULL) RC.nb_inst = config_setting_length(setting);
+    if (RC.nb_inst > 0) {
+      printf("Number of eNB RRC instances %d\n",RC.nb_inst);
+      setting = config_lookup(&cfg, ENB_CONFIG_STRING_ENB_LIST);
+      RC.nb_CC = (int *)malloc((1+RC.nb_inst)*sizeof(int));
+      for (int i=0;i<RC.nb_inst;i++) {
+	setting_enb                  = config_setting_get_elem(setting, i);
+	setting_component_carriers   = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_COMPONENT_CARRIERS);
+	AssertFatal(setting_component_carriers != NULL, "No component carrier definitions in %s\n",RC.config_file_name);
+	RC.nb_CC[i]                = config_setting_length(setting_component_carriers);
+	printf("Setting nb_CC to %d for instance %d\n",RC.nb_CC[i],i);
+
+      }
     }
 
+    // Get num MACRLC instances
+    setting = config_lookup(&cfg, CONFIG_STRING_MACRLC_LIST);
+    if (setting != NULL) RC.nb_macrlc_inst = config_setting_length(setting);
+
+    // Get num L1 instances
+    setting = config_lookup(&cfg, CONFIG_STRING_L1_LIST);
+    if (setting != NULL) RC.nb_L1_inst = config_setting_length(setting);
+
+    // Get num RU instances
+    setting = config_lookup(&cfg, CONFIG_STRING_RU_LIST);
+    if (setting != NULL) RC.nb_RU     = config_setting_length(setting);
   }
+  else {
+    config_destroy(&cfg);
+    AssertFatal(0,"Configuration file is null\n");
+  }
+
+}
diff --git a/openair2/LAYER2/MAC/config.c b/openair2/LAYER2/MAC/config.c
index c035490105..0d9980ed10 100644
--- a/openair2/LAYER2/MAC/config.c
+++ b/openair2/LAYER2/MAC/config.c
@@ -330,7 +330,7 @@ void config_sib2(int Mod_idP,
     cfg->emtc_config.prach_catm_zero_correlation_zone_configuration.value = radioResourceConfigCommon_BRP->prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig;
     cfg->emtc_config.prach_catm_high_speed_flag.value                     = radioResourceConfigCommon_BRP->prach_Config.prach_ConfigInfo.highSpeedFlag;
  
-    struct PRACH_ConfigSIB_v1310 *ext4_prach=radioResourceConfigCommonP->ext4->prach_ConfigCommon_v1310; 
+    struct PRACH_ConfigSIB_v1310 *ext4_prach=radioResourceConfigCommon_BRP->ext4->prach_ConfigCommon_v1310; 
 
     PRACH_ParametersListCE_r13_t	 *prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
     int i;
@@ -342,40 +342,44 @@ void config_sib2(int Mod_idP,
     switch (prach_ParametersListCE_r13->list.count) {
     case 4:
       p=prach_ParametersListCE_r13->list.array[3];
-      cfg->emtc_config.prach_ce_level_3_enable.value                          = 1;
-      cfg->emtc_config.prach_ce_level_3_configuration_index.value             = p->prach_ConfigIndex_r13;
-      cfg->emtc_config.prach_ce_level_3_frequency_offset.value                = p->prach_FreqOffset_r13;
+      cfg->emtc_config.prach_ce_level_3_enable.value                            = 1;
+      cfg->emtc_config.prach_ce_level_3_configuration_index.value               = p->prach_ConfigIndex_r13;
+      cfg->emtc_config.prach_ce_level_3_frequency_offset.value                  = p->prach_FreqOffset_r13;
+      cfg->emtc_config.prach_ce_level_3_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
       if (p->prach_StartingSubframe_r13) 
-	cfg->emtc_config.prach_ce_level_3_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
-      cfg->emtc_config.prach_ce_level_3_hopping_enable.value                  = p->prach_HoppingConfig_r13;
-      cfg->emtc_config.prach_ce_level_3_hopping_offset.value                  = cfg->rf_config.ul_channel_bandwidth.value-6;
+	cfg->emtc_config.prach_ce_level_3_starting_subframe_periodicity.value   = *p->prach_StartingSubframe_r13;
+      cfg->emtc_config.prach_ce_level_3_hopping_enable.value                    = p->prach_HoppingConfig_r13;
+      cfg->emtc_config.prach_ce_level_3_hopping_offset.value                    = cfg->rf_config.ul_channel_bandwidth.value-6;
     case 3:
       p=prach_ParametersListCE_r13->list.array[2];
-      cfg->emtc_config.prach_ce_level_2_enable.value                          = 1;
-      cfg->emtc_config.prach_ce_level_2_configuration_index.value             = p->prach_ConfigIndex_r13;
-      cfg->emtc_config.prach_ce_level_2_frequency_offset.value                = p->prach_FreqOffset_r13;
+      cfg->emtc_config.prach_ce_level_2_enable.value                            = 1;
+      cfg->emtc_config.prach_ce_level_2_configuration_index.value               = p->prach_ConfigIndex_r13;
+      cfg->emtc_config.prach_ce_level_2_frequency_offset.value                  = p->prach_FreqOffset_r13;
+      cfg->emtc_config.prach_ce_level_2_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
       if (p->prach_StartingSubframe_r13) 
-	cfg->emtc_config.prach_ce_level_2_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
-      cfg->emtc_config.prach_ce_level_2_hopping_enable.value                  = p->prach_HoppingConfig_r13;
-      cfg->emtc_config.prach_ce_level_2_hopping_offset.value                  = cfg->rf_config.ul_channel_bandwidth.value-6;
+	cfg->emtc_config.prach_ce_level_2_starting_subframe_periodicity.value   = *p->prach_StartingSubframe_r13;
+      cfg->emtc_config.prach_ce_level_2_hopping_enable.value                    = p->prach_HoppingConfig_r13;
+      cfg->emtc_config.prach_ce_level_2_hopping_offset.value                    = cfg->rf_config.ul_channel_bandwidth.value-6;
     case 2:
       p=prach_ParametersListCE_r13->list.array[1];
-      cfg->emtc_config.prach_ce_level_1_enable.value                          = 1;
-      cfg->emtc_config.prach_ce_level_1_configuration_index.value             = p->prach_ConfigIndex_r13;
-      cfg->emtc_config.prach_ce_level_1_frequency_offset.value                = p->prach_FreqOffset_r13;
+      cfg->emtc_config.prach_ce_level_1_enable.value                            = 1;
+      cfg->emtc_config.prach_ce_level_1_configuration_index.value               = p->prach_ConfigIndex_r13;
+      cfg->emtc_config.prach_ce_level_1_frequency_offset.value                  = p->prach_FreqOffset_r13;
+      cfg->emtc_config.prach_ce_level_1_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
       if (p->prach_StartingSubframe_r13) 
-	cfg->emtc_config.prach_ce_level_1_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
-      cfg->emtc_config.prach_ce_level_1_hopping_enable.value                  = p->prach_HoppingConfig_r13;
-      cfg->emtc_config.prach_ce_level_1_hopping_offset.value                  = cfg->rf_config.ul_channel_bandwidth.value-6;
+	cfg->emtc_config.prach_ce_level_1_starting_subframe_periodicity.value   = *p->prach_StartingSubframe_r13;
+      cfg->emtc_config.prach_ce_level_1_hopping_enable.value                    = p->prach_HoppingConfig_r13;
+      cfg->emtc_config.prach_ce_level_1_hopping_offset.value                    = cfg->rf_config.ul_channel_bandwidth.value-6;
     case 1:
       p=prach_ParametersListCE_r13->list.array[0];
-      cfg->emtc_config.prach_ce_level_0_enable.value                          = 1;
-      cfg->emtc_config.prach_ce_level_0_configuration_index.value             = p->prach_ConfigIndex_r13;
-      cfg->emtc_config.prach_ce_level_0_frequency_offset.value                = p->prach_FreqOffset_r13;
+      cfg->emtc_config.prach_ce_level_0_enable.value                            = 1;
+      cfg->emtc_config.prach_ce_level_0_configuration_index.value               = p->prach_ConfigIndex_r13;
+      cfg->emtc_config.prach_ce_level_0_frequency_offset.value                  = p->prach_FreqOffset_r13;
+      cfg->emtc_config.prach_ce_level_0_number_of_repetitions_per_attempt.value = p->numRepetitionPerPreambleAttempt_r13;
       if (p->prach_StartingSubframe_r13) 
-	cfg->emtc_config.prach_ce_level_0_starting_subframe_periodicity.value = *p->prach_StartingSubframe_r13;
-      cfg->emtc_config.prach_ce_level_0_hopping_enable.value                  = p->prach_HoppingConfig_r13;
-      cfg->emtc_config.prach_ce_level_0_hopping_offset.value                  = cfg->rf_config.ul_channel_bandwidth.value-6;
+	cfg->emtc_config.prach_ce_level_0_starting_subframe_periodicity.value   = *p->prach_StartingSubframe_r13;
+      cfg->emtc_config.prach_ce_level_0_hopping_enable.value                    = p->prach_HoppingConfig_r13;
+      cfg->emtc_config.prach_ce_level_0_hopping_offset.value                    = cfg->rf_config.ul_channel_bandwidth.value-6;
     }
 
     struct FreqHoppingParameters_r13 *ext4_freqHoppingParameters = radioResourceConfigCommonP->ext4->freqHoppingParameters_r13;
diff --git a/openair2/LAYER2/MAC/defs.h b/openair2/LAYER2/MAC/defs.h
index 45619246c4..2c8b613b1d 100644
--- a/openair2/LAYER2/MAC/defs.h
+++ b/openair2/LAYER2/MAC/defs.h
@@ -824,10 +824,18 @@ typedef struct {
   uint8_t generate_rar;
   /// Subframe where preamble was received
   uint8_t preamble_subframe;
+  /// Subframe where Msg2 is to be sent
+  uint8_t Msg2_subframe;
+  /// Frame where Msg2 is to be sent
+  uint8_t Msg2_frame;
   /// Subframe where Msg3 is to be sent
   uint8_t Msg3_subframe;
-  /// Subframe where Msg3 is to be sent
+  /// Frame where Msg3 is to be sent
   uint8_t Msg3_frame;
+  /// Subframe where Msg4 is to be sent
+  uint8_t Msg4_subframe;
+  /// Frame where Msg4 is to be sent
+  uint8_t Msg4_frame;
   /// Flag to indicate the eNB should generate Msg4 upon reception of SDU from RRC.  This is triggered by first ULSCH reception at eNB for new user.
   uint8_t generate_Msg4;
   /// Flag to indicate that eNB is waiting for ACK that UE has received Msg3.
@@ -846,6 +854,13 @@ typedef struct {
   int16_t RRC_timer;
   /// Round of Msg3 HARQ
   uint8_t msg3_round;
+#ifdef Rel14
+  uint8_t rach_resource_type;
+  uint8_t msg2_mpdcch_repetition_cnt;
+  uint8_t msg4_mpdcch_repetition_cnt;
+  uint8_t msg2_narrowband;
+  uint8_t msg34_narrowband;
+#endif
 } RA_TEMPLATE;
 
 
@@ -962,7 +977,7 @@ typedef struct eNB_MAC_INST_s {
   /// Ethernet parameters for fronthaul interface
   eth_params_t         eth_params_s;
   ///
-  uint16_t Node_id;
+  module_id_t Mod_id;
   /// frame counter
   frame_t frame;
   /// subframe counter
@@ -1030,6 +1045,15 @@ typedef struct eNB_MAC_INST_s {
  * UE part 
  */ 
 
+typedef enum {
+  TYPE0,
+  TYPE1,
+  TYPE1A,
+  TYPE2,
+  TYPE2A,
+  TYPEUESPEC
+} MPDCCH_TYPES_t;
+
 /*!\brief UE layer 2 status */
 typedef enum {
   CONNECTION_OK=0,
diff --git a/openair2/LAYER2/MAC/eNB_scheduler.c b/openair2/LAYER2/MAC/eNB_scheduler.c
index 6a4c1424a9..39f54e0856 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler.c
@@ -313,10 +313,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
   }
 
 #endif
-  LOG_I(MAC,"[eNB %d][before switch] Frame %d, Subframe %d CC_id %d RA 0 is active, Msg3 in (%d,%d), (%d,%d,%d,%d) UL_pdus %d\n",
-	module_idP,frameP,subframeP,CC_id,cc[0].RA_template[0].Msg3_frame,cc[0].RA_template[0].Msg3_subframe,
-	cc[0].RA_template[0].RA_active,cc[0].RA_template[1].RA_active,cc[0].RA_template[2].RA_active,cc[0].RA_template[3].RA_active,
-	RC.mac[module_idP]->UL_req[0].ul_config_request_body.number_of_pdus);
+
   switch (subframeP) {
   case 0:
 
@@ -326,9 +323,9 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
 
 
     //    schedule_RA(module_idP,frameP,subframeP,2);
-    LOG_I(MAC,"Scheduling MIB\n");
+    LOG_D(MAC,"Scheduling MIB\n");
     if ((frameP&3) == 0) schedule_mib(module_idP,frameP,subframeP);
-    LOG_I(MAC,"NFAPI: number_of_pdus %d, number_of_TX_req %d\n",
+    LOG_D(MAC,"NFAPI: number_of_pdus %d, number_of_TX_req %d\n",
 	  DL_req[0].dl_config_request_body.number_pdu,
 	  TX_req[0].tx_request_body.number_of_pdus);
     if (cc[0].tdd_Config == NULL) {  //FDD
@@ -1026,21 +1023,12 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
 
   }
 
-  LOG_I(MAC,"FrameP %d, subframeP %d : Scheduling CCEs/Msg3\n",frameP,subframeP);
-
-  LOG_I(MAC,"[eNB %d][before] Frame %d, Subframe %d CC_id %d RA 0 is active, Msg3 in (%d,%d) (%d,%d,%d,%d) UL_pdus %d\n",
-	module_idP,frameP,subframeP,CC_id,cc[0].RA_template[0].Msg3_frame,cc[0].RA_template[0].Msg3_subframe,
-	cc[0].RA_template[0].RA_active,cc[0].RA_template[1].RA_active,cc[0].RA_template[2].RA_active,cc[0].RA_template[3].RA_active,
-	RC.mac[module_idP]->UL_req[0].ul_config_request_body.number_of_pdus);
   // Allocate CCEs and Msg3 for good after scheduling is done
   for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++) {
     allocate_CCEs(module_idP,CC_id,subframeP,0);
     check_and_add_msg3(module_idP,frameP,subframeP);
   }
-  LOG_I(MAC,"[eNB %d][after] Frame %d, Subframe %d CC_id 0 RA 0 is active, Msg3 in (%d,%d) (%d,%d,%d,%d) UL_pdus %d\n",
-	module_idP,frameP,subframeP,cc[0].RA_template[0].Msg3_frame,cc[0].RA_template[0].Msg3_subframe,
-	cc[0].RA_template[0].RA_active,cc[0].RA_template[1].RA_active,cc[0].RA_template[2].RA_active,cc[0].RA_template[3].RA_active,
-	RC.mac[module_idP]->UL_req[0].ul_config_request_body.number_of_pdus);
+
 #if defined(FLEXRAN_AGENT_SB_IF)
 #ifndef DISABLE_CONT_STATS
   //Send subframe trigger to the controller
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_RA.c b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
index d6e245d180..47a809f032 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_RA.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
@@ -174,6 +174,31 @@ void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,un
   int round;
   nfapi_dl_config_request_body_t *dl_req;
 
+#ifdef Rel14
+  int rmax            = 0;
+  int rep             = 0; 
+  int reps            = 0;
+  int num_nb          = 0;
+  first_rb        = 0;
+
+  struct PRACH_ConfigSIB_v1310 *ext4_prach                 = cc[CC_id].radioResourceConfigCommon_BR->ext4->prach_ConfigCommon_v1310;
+  PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
+  PRACH_ParametersCE_r13_t *p[3];
+
+  switch (prach_ParametersListCE_r13->list.count) {
+  case 4:
+    p[3]=prach_ParametersListCE_r13->list.array[3];
+  case 3:
+    p[2]=prach_ParametersListCE_r13->list.array[2];
+  case 2:
+    p[1]=prach_ParametersListCE_r13->list.array[1];
+  case 1:
+    p[0]=prach_ParametersListCE_r13->list.array[0];
+  default:
+    AssertFatal(1==0,"Illegal count for prach_ParametersListCE_r13 %d\n",prach_ParametersListCE_r13->list.count);
+  }
+#endif
+
   start_meas(&eNB->schedule_ra);
 
   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
@@ -193,93 +218,248 @@ void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,un
               module_idP,CC_id,i,RA_template->generate_rar,RA_template->generate_Msg4,RA_template->wait_ack_Msg4, RA_template->rnti);
 
         if (RA_template->generate_rar == 1) {
+  
+#ifdef Rel14
+	  if (RA_template->rach_resource_type > 0) {
 
-          LOG_D(MAC,"[eNB %d] CC_id %d Frame %d, subframeP %d: Generating RAR DCI (proc %d), RA_active %d format 1A (%d,%d))\n",
-                module_idP, CC_id, frameP, subframeP,i,
-                RA_template->RA_active,
-                RA_template->RA_dci_fmt1,
-                RA_template->RA_dci_size_bits1);
+	    // This uses an MPDCCH Type 2 allocation according to Section 9.1.5 36-213
+	    // Parameters:
+	    //    p=2+4 PRB set (number of PRB pairs 6)
+	    //    rmax = mpdcch-NumRepetition-RA-r13 => Table 9.1.5-3
+	    //    if CELevel = 0,1 => Table 9.1.5-1b for MPDCCH candidates
+	    //    if CELevel = 2,3 => Table 9.1.5-2b for MPDCCH candidates
+	    //    distributed transmission
+	    
+	    // rmax from SIB2 information
+	    rmax           = p[RA_template->rach_resource_type-1]->mpdcch_NumRepetition_RA_r13;
+	    // choose r3 by default for RAR
+	    rep            = 2; 
+	    // get actual repetition count from Table 9.1.5-3
+	    reps           = (rmax<=8)?(1<<rep):(rmax>>(3-rep));
+	    // get narrowband according to higher-layer config 
+	    num_nb = p[RA_template->rach_resource_type-1]->mpdcch_NarrowbandsToMonitor_r13.list.count;
+	    RA_template->msg2_narrowband = *p[RA_template->rach_resource_type-1]->mpdcch_NarrowbandsToMonitor_r13.list.array[RA_template->preamble_index%num_nb];
+	    first_rb = RA_template->msg2_narrowband*6;
 
-          first_rb = 0;
-          vrb_map[first_rb] = 1;
-          vrb_map[first_rb+1] = 1;
-          vrb_map[first_rb+2] = 1;
-          vrb_map[first_rb+3] = 1;
+	    if ((RA_template->msg2_mpdcch_repetition_cnt == 0) &&
+		(mpdcch_sf_condition(eNB,CC_id,frameP,subframeP,rmax,TYPE2)>0)){
+	      // MPDCCH configuration for RAR
 
-	  memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
-	  dl_config_pdu->pdu_type                                                          = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE; 
-	  dl_config_pdu->pdu_size                                                          = (uint8_t)(2+sizeof(nfapi_dl_config_dci_dl_pdu));
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format                             = NFAPI_DL_DCI_FORMAT_1A;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level                      = 4;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti                                   = RA_template->RA_rnti;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type                              = 2;    // RA-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power                     = 6000; // equal to RS power
+
+	      
+	      memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+	      dl_config_pdu->pdu_type                                                                  = NFAPI_DL_CONFIG_MPDCCH_PDU_TYPE; 
+	      dl_config_pdu->pdu_size                                                                  = (uint8_t)(2+sizeof(nfapi_dl_config_mpdcch_pdu));
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_format                                    = (RA_template->rach_resource_type > 1) ? 11 : 10;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_narrow_band                            = RA_template->msg2_narrowband;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.number_of_prb_pairs                           = 6;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_assignment                     = 0; // Note: this can be dynamic
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_tansmission_type                       = 1;
+	      AssertFatal(cc[CC_id].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13!=NULL,
+			  "cc[CC_id].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13 is null\n");
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.start_symbol                                  = cc[CC_id].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ecce_index                                    = 0;  // Note: this should be dynamic
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.aggregation_level                             = 16; // OK for CEModeA r1-3 (9.1.5-1b) or CEModeB r1-4
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti_type                                     = 2;  // RA-RNTI
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti                                          = RA_template->RA_rnti;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ce_mode                                       = (RA_template->rach_resource_type < 3) ? 1 : 2;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.drms_scrambling_init                          = cc[CC_id].physCellId;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.initial_transmission_sf_io                    = (frameP*10)+subframeP;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.transmission_power                            = 6000; // 0dB
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_coding                         = getRIV(N_RB_DL,first_rb,6);
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mcs                                           = 4; // adjust according to size of RAR, 208 bits with N1A_PRB=3
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pdsch_reptition_levels                        = 4; // fix to 4 for now
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.redundancy_version                            = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.new_data_indicator                            = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_process                                  = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi_length                                   = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi                                          = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi_flag                                      = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi                                           = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_resource_offset                          = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_subframe_repetition_number                = rep; 
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpc                                           = 2;// N1A_PRB=3; => 208 bits
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.downlink_assignment_index_length              = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.downlink_assignment_index                     = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.allocate_prach_flag                           = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.preamble_index                                = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.prach_mask_index                              = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.starting_ce_level                             = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.srs_request                                   = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity_flag    = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity         = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.frequency_hopping_enabled_flag                = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.paging_direct_indication_differentiation_flag = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.direct_indication                             = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.total_dci_length_including_padding            = 0; // this is not needed by OAI L1, but should be filled in
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.number_of_tx_antenna_ports                    = 1;
+	      RA_template->msg2_mpdcch_repetition_cnt++;
+	      dl_req->number_pdu++;
+	       
+	    } //repetition_count==0 && SF condition met
+	    if (RA_template->msg2_mpdcch_repetition_cnt>0) { // we're in a stream of repetitions
+	      RA_template->msg2_mpdcch_repetition_cnt++;	      
+	      if (RA_template->msg2_mpdcch_repetition_cnt==reps) { // this is the last mpdcch repetition
+		if (cc[CC_id].tdd_Config==NULL) { // FDD case
+		  // wait 2 subframes for PDSCH transmission
+		  if (subframeP>7) RA_template->Msg2_frame = (frameP+1)&1023;
+		  else             RA_template->Msg2_frame = frameP;
+		  RA_template->Msg2_subframe               = (subframeP+2)%10; 
+		}
+		else {
+		  AssertFatal(1==0,"TDD case not done yet\n");
+		}
+	      } // mpdcch_repetition_count == reps
+	      if ((RA_template->Msg2_frame == frameP) && (RA_template->Msg2_subframe == subframeP)) {
+		// Program PDSCH
+		RA_template->generate_rar = 0;	      
+
+		dl_config_pdu                                                                  = &dl_req->dl_config_pdu_list[dl_req->number_pdu]; 
+		memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+		dl_config_pdu->pdu_type                                                        = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE; 
+		dl_config_pdu->pdu_size                                                        = (uint8_t)(2+sizeof(nfapi_dl_config_dlsch_pdu));
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index                              = eNB->pdu_index[CC_id];
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti                                   = RA_template->RA_rnti;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type               = 2;   // format 1A/1B/1D
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0;   // localized
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding                  = getRIV(N_RB_DL,first_rb,6);
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation                             = 2; //QPSK
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version                     = 0;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks                       = 1;// first block
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag  = 0;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme                    = (cc->p_eNB==1 ) ? 0 : 1;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers                       = 1;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands                     = 1;
+		//	dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index                         = ;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity                   = 1;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa                                     = 4; // 0 dB
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index               = 0;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap                                   = 0;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb                                   = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode                      = (cc->p_eNB==1 ) ? 1 : 2;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband                 = 1;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector                          = 1;
+		//	dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector                    = ; 
+
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type                               = (RA_template->rach_resource_type < 3) ? 1 : 2;;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type                    = 2;  // not SI message
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io            = (10*frameP)+subframeP;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.drms_table_flag                       = 0;
+		dl_req->number_pdu++;
+
+		// Program UL processing for Msg3, same as regular LTE
+		get_Msg3alloc(&cc[CC_id],subframeP,frameP,&RA_template->Msg3_frame,&RA_template->Msg3_subframe);
+		
+		
+		fill_rar_br(eNB,CC_id,i,frameP,subframeP,cc[CC_id].RAR_pdu.payload,RA_template->rach_resource_type-1);
+		// DL request
+		eNB->TX_req[CC_id].sfn_sf                                             = (frameP<<3)+subframeP;
+		TX_req                                                                = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus]; 		     
+		TX_req->pdu_length                                                    = 7;  // This should be changed if we have more than 1 preamble 
+		TX_req->pdu_index                                                     = eNB->pdu_index[CC_id]++;
+		TX_req->num_segments                                                  = 1;
+		TX_req->segments[0].segment_length                                    = 7;
+		TX_req->segments[0].segment_data                                      = cc[CC_id].RAR_pdu.payload;
+		eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
+	      }
+	    }      
+
+	  }		
+	  else
+#endif
+	    {
+	      if ((RA_template->Msg2_frame == frameP) && (RA_template->Msg2_subframe == subframeP)) {
+		LOG_D(MAC,"[eNB %d] CC_id %d Frame %d, subframeP %d: Generating RAR DCI (proc %d), RA_active %d format 1A (%d,%d))\n",
+		      module_idP, CC_id, frameP, subframeP,i,
+		      RA_template->RA_active,
+		      
+		      RA_template->RA_dci_fmt1,
+		      RA_template->RA_dci_size_bits1);
+		
+		first_rb = 0;
+		vrb_map[first_rb] = 1;
+		vrb_map[first_rb+1] = 1;
+		vrb_map[first_rb+2] = 1;
+		vrb_map[first_rb+3] = 1;
+		
+		memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+		dl_config_pdu->pdu_type                                                          = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE; 
+		dl_config_pdu->pdu_size                                                          = (uint8_t)(2+sizeof(nfapi_dl_config_dci_dl_pdu));
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format                             = NFAPI_DL_DCI_FORMAT_1A;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level                      = 4;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti                                   = RA_template->RA_rnti;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type                              = 2;    // RA-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power                     = 6000; // equal to RS power
+		
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process                           = 0;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc                                    = 1; // no TPC
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1                   = 1;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                                  = 0;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1                   = 0;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
+		
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding                  = getRIV(N_RB_DL,first_rb,4);      
+		
+		if (!CCE_allocation_infeasible(module_idP,CC_id,1,subframeP,dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,RA_template->RA_rnti)) {
+		  LOG_D(MAC,"Frame %d: Subframe %d : Adding common DCI for RA_RNTI %x\n",
+			frameP,subframeP,RA_template->RA_rnti);
+		  dl_req->number_dci++;
+		  dl_req->number_pdu++;
+		  
+		  dl_config_pdu                                                                  = &dl_req->dl_config_pdu_list[dl_req->number_pdu]; 
+		  memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+		  dl_config_pdu->pdu_type                                                        = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE; 
+		  dl_config_pdu->pdu_size                                                        = (uint8_t)(2+sizeof(nfapi_dl_config_dlsch_pdu));
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index                              = eNB->pdu_index[CC_id];
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti                                   = RA_template->RA_rnti;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type               = 2;   // format 1A/1B/1D
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0;   // localized
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding                  = getRIV(N_RB_DL,first_rb,4);
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation                             = 2; //QPSK
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version                     = 0;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks                       = 1;// first block
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag  = 0;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme                    = (cc->p_eNB==1 ) ? 0 : 1;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers                       = 1;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands                     = 1;
+		  //	dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index                         = ;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity                   = 1;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa                                     = 4; // 0 dB
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index               = 0;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap                                   = 0;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb                                   = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode                      = (cc->p_eNB==1 ) ? 1 : 2;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband                 = 1;
+		  dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector                          = 1;
+		  //	dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector                    = ; 
+		  dl_req->number_pdu++;
+		  
+		  // Program UL processing for Msg3
+		  get_Msg3alloc(&cc[CC_id],subframeP,frameP,&RA_template->Msg3_frame,&RA_template->Msg3_subframe);
+		  
+		  
+		  fill_rar(module_idP,CC_id,frameP,cc[CC_id].RAR_pdu.payload,N_RB_DL,7);
+		  // DL request
+		  eNB->TX_req[CC_id].sfn_sf                                             = (frameP<<3)+subframeP;
+		  TX_req                                                                = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus]; 		     
+		  TX_req->pdu_length                                                    = 7;  // This should be changed if we have more than 1 preamble 
+		  TX_req->pdu_index                                                     = eNB->pdu_index[CC_id]++;
+		  TX_req->num_segments                                                  = 1;
+		  TX_req->segments[0].segment_length                                    = 7;
+		  TX_req->segments[0].segment_data                                      = cc[CC_id].RAR_pdu.payload;
+		  eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
+		} // PDCCH CCE allocation is feasible
+	      } // Msg2 frame/subframe condition
+	    } // else BL/CE
+	} // state generate_rar == 1
+	else if (RA_template->generate_Msg4 == 1) {
+
+	  // check for Msg4 Message
 	  
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process                           = 0;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc                                    = 1; // no TPC
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1                   = 1;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                                  = 0;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1                   = 0;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
-
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding                  = getRIV(N_RB_DL,first_rb,4);      
-
-	  if (!CCE_allocation_infeasible(module_idP,CC_id,1,subframeP,dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,RA_template->RA_rnti)) {
-	    LOG_D(MAC,"Frame %d: Subframe %d : Adding common DCI for RA_RNTI %x\n",
-                  frameP,subframeP,RA_template->RA_rnti);
-	    dl_req->number_dci++;
-	    dl_req->number_pdu++;
-
-	    dl_config_pdu                                                                  = &dl_req->dl_config_pdu_list[dl_req->number_pdu]; 
-	    memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
-	    dl_config_pdu->pdu_type                                                        = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE; 
-	    dl_config_pdu->pdu_size                                                        = (uint8_t)(2+sizeof(nfapi_dl_config_dlsch_pdu));
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index                              = eNB->pdu_index[CC_id];
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti                                   = RA_template->RA_rnti;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type               = 2;   // format 1A/1B/1D
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0;   // localized
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding                  = getRIV(N_RB_DL,first_rb,4);
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation                             = 2; //QPSK
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version                     = 0;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks                       = 1;// first block
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag  = 0;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme                    = (cc->p_eNB==1 ) ? 0 : 1;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers                       = 1;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands                     = 1;
-	    //	dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index                         = ;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity                   = 1;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa                                     = 4; // 0 dB
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index               = 0;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap                                   = 0;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb                                   = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode                      = (cc->p_eNB==1 ) ? 1 : 2;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband                 = 1;
-	    dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector                          = 1;
-	    //	dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector                    = ; 
-	    dl_req->number_pdu++;
-
-	    // Program UL processing for Msg3
-	    get_Msg3alloc(&cc[CC_id],subframeP,frameP,&RA_template->Msg3_frame,&RA_template->Msg3_subframe);
-
-
-	    fill_rar(module_idP,CC_id,frameP,cc[CC_id].RAR_pdu.payload,N_RB_DL,7);
-	    // DL request
-	    eNB->TX_req[CC_id].sfn_sf                                             = (frameP<<3)+subframeP;
-	    TX_req                                                                = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus]; 		     
-	    TX_req->pdu_length                                                    = 7;  // This should be changed if we have more than 1 preamble 
-	    TX_req->pdu_index                                                     = eNB->pdu_index[CC_id]++;
-	    TX_req->num_segments                                                  = 1;
-	    TX_req->segments[0].segment_length                                    = 7;
-	    TX_req->segments[0].segment_data                                      = cc[CC_id].RAR_pdu.payload;
-	    eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
-	  }
-        } else if (RA_template->generate_Msg4 == 1) {
-
-          // check for Msg4 Message
-          UE_id = find_UE_id(module_idP,RA_template->rnti);
+	  UE_id = find_UE_id(module_idP,RA_template->rnti);
 	  AssertFatal(UE_id>=0,"Can't find UE for t-crnti\n");
-
-
+	  
+	  
 	  // Get RRCConnectionSetup for Piggyback
 	  rrc_sdu_length = mac_rrc_data_req(module_idP,
 					    CC_id,
@@ -292,224 +472,436 @@ void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,un
 					    0); // not used in this case
 	  
 	  AssertFatal(rrc_sdu_length>=0,
-			"[MAC][eNB Scheduler] CCCH not allocated\n");
-	
-
-          LOG_D(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: UE_id %d, rrc_sdu_length %d\n",
-                module_idP, CC_id, frameP, subframeP,UE_id, rrc_sdu_length);
-
-          if (rrc_sdu_length>0) {
-            LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Generating Msg4 with RRC Piggyback (RA proc %d, RNTI %x)\n",
-                  module_idP, CC_id, frameP, subframeP,i,RA_template->rnti);
-
-	    first_rb=0;
-
-	    vrb_map[first_rb] = 1;
-	    vrb_map[first_rb+1] = 1;
-	    vrb_map[first_rb+2] = 1;
-	    vrb_map[first_rb+3] = 1;
+		      "[MAC][eNB Scheduler] CCCH not allocated\n");
+	  
+	  
+	  LOG_D(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: UE_id %d, rrc_sdu_length %d\n",
+		module_idP, CC_id, frameP, subframeP,UE_id, rrc_sdu_length);
 
 
-	    memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
-	    dl_config_pdu->pdu_type                                                          = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE; 
-	    dl_config_pdu->pdu_size                                                          = (uint8_t)(2+sizeof(nfapi_dl_config_dci_dl_pdu));
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format                             = NFAPI_DL_DCI_FORMAT_1A;
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level                      = 4;
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti                                   = RA_template->rnti;
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type                              = 1;    // C-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power                     = 6000; // equal to RS power
+#ifdef Rel14
+	  if (RA_template->rach_resource_type>0) {
+
+	    // Generate DCI + repetitions first
+	    // This uses an MPDCCH Type 2 allocation according to Section 9.1.5 36-213
+	    // Parameters:
+	    //    p=2+4 PRB set (number of PRB pairs 6)
+	    //    rmax = mpdcch-NumRepetition-RA-r13 => Table 9.1.5-3
+	    //    if CELevel = 0,1 => Table 9.1.5-1b for MPDCCH candidates
+	    //    if CELevel = 2,3 => Table 9.1.5-2b for MPDCCH candidates
+	    //    distributed transmission
 	    
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process                           = 0;
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc                                    = 1; // no TPC
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1                   = 1;
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1                   = 0;
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
-
-            // Compute MCS for 3 PRB
-            msg4_header = 1+6+1;  // CR header, CR CE, SDU header
-
-
-	    if ((rrc_sdu_length+msg4_header) <= 22) {
-	      dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 4;
-	      TBsize = 22;
-	    } else if ((rrc_sdu_length+msg4_header) <= 28) {
-	      dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 5;
-	      TBsize = 28;
-	    } else if ((rrc_sdu_length+msg4_header) <= 32) {
-	      dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 6;
-	      TBsize = 32;
-	    } else if ((rrc_sdu_length+msg4_header) <= 41) {
-	      dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 7;
-	      TBsize = 41;
-	    } else if ((rrc_sdu_length+msg4_header) <= 49) {
-	      dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 8;
-	      TBsize = 49;
-	    } else if ((rrc_sdu_length+msg4_header) <= 57) {
-	      dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 9;
-	      TBsize = 57;
-	    }
-
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding= getRIV(N_RB_DL,first_rb,4);
-
-	    if (!CCE_allocation_infeasible(module_idP,CC_id,0,subframeP,dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,RA_template->rnti)) {
-	      dl_req->number_dci++;
+	    // rmax from SIB2 information
+	    rmax           = p[RA_template->rach_resource_type-1]->mpdcch_NumRepetition_RA_r13;
+	    // choose r3 by default for Msg4
+	    rep            = 2; 
+	    // get actual repetition count from Table 9.1.5-3
+	    reps           = (rmax<=8)?(1<<rep):(rmax>>(3-rep));
+	    // get first narrowband
+	    first_rb = RA_template->msg34_narrowband*6;
+	    
+	    if ((RA_template->msg4_mpdcch_repetition_cnt == 0) &&
+		(mpdcch_sf_condition(eNB,CC_id,frameP,subframeP,rmax,TYPE2)>0)){
+	      // MPDCCH configuration for RAR
+	      
+	      memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+	      dl_config_pdu->pdu_type                                                                  = NFAPI_DL_CONFIG_MPDCCH_PDU_TYPE; 
+	      dl_config_pdu->pdu_size                                                                  = (uint8_t)(2+sizeof(nfapi_dl_config_mpdcch_pdu));
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_format                                    = (RA_template->rach_resource_type > 1) ? 11 : 10;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_narrow_band                            = RA_template->msg34_narrowband;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.number_of_prb_pairs                           = 6;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_assignment                     = 0; // Note: this can be dynamic
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mpdcch_tansmission_type                       = 1;
+	      AssertFatal(cc[CC_id].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13!=NULL,
+			  "cc[CC_id].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13 is null\n");
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.start_symbol                                  = cc[CC_id].sib1_v13ext->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ecce_index                                    = 0;  // Note: this should be dynamic
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.aggregation_level                             = 16; // OK for CEModeA r1-3 (9.1.5-1b) or CEModeB r1-4
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti_type                                     = 2;  // RA-RNTI
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.rnti                                          = RA_template->RA_rnti;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.ce_mode                                       = (RA_template->rach_resource_type < 3) ? 1 : 2;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.drms_scrambling_init                          = cc[CC_id].physCellId;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.initial_transmission_sf_io                    = (frameP*10)+subframeP;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.transmission_power                            = 6000; // 0dB
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.resource_block_coding                         = getRIV(N_RB_DL,first_rb,6);
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.mcs                                           = 4; // adjust according to size of RAR, 208 bits with N1A_PRB=3
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pdsch_reptition_levels                        = 4; // fix to 4 for now
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.redundancy_version                            = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.new_data_indicator                            = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_process                                  = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi_length                                   = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpmi                                          = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi_flag                                      = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.pmi                                           = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.harq_resource_offset                          = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.dci_subframe_repetition_number                = rep; 
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.tpc                                           = 2;// N1A_PRB=3; => 208 bits
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.downlink_assignment_index_length              = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.downlink_assignment_index                     = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.allocate_prach_flag                           = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.preamble_index                                = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.prach_mask_index                              = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.starting_ce_level                             = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.srs_request                                   = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity_flag    = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.antenna_ports_and_scrambling_identity         = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.frequency_hopping_enabled_flag                = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.paging_direct_indication_differentiation_flag = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.direct_indication                             = 0;
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.total_dci_length_including_padding            = 0; // this is not needed by OAI L1, but should be filled in
+	      dl_config_pdu->mpdcch_pdu.mpdcch_pdu_rel13.number_of_tx_antenna_ports                    = 1;
+	      RA_template->msg4_mpdcch_repetition_cnt++;
 	      dl_req->number_pdu++;
-		      
-	      RA_template->generate_Msg4=0;
-	      RA_template->wait_ack_Msg4=1;
-	      RA_template->RA_active = FALSE;
-	      lcid=0;
-
-	      // set HARQ process 0 round to 0 for this UE
-	      UE_list->UE_sched_ctrl[UE_id].round[CC_id] = 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] CC_id %d Frame %d subframeP %d Msg4 : TBS %d, sdu_len %d, msg4_header %d, msg4_padding %d, msg4_post_padding %d\n",
-		    module_idP,CC_id,frameP,subframeP,TBsize,rrc_sdu_length,msg4_header,msg4_padding,msg4_post_padding);
-	      DevAssert( UE_id != UE_INDEX_INVALID ); // FIXME not sure how to gracefully return
-	      // CHECK THIS: &cc[CC_id].CCCH_pdu.payload[0]
-	      offset = generate_dlsch_header((unsigned char*)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
-					     1,                           //num_sdus
-					     (unsigned short*)&rrc_sdu_length,             //
-					     &lcid,                       // sdu_lcid
-					     255,                         // no drx
-					     0,                           // no timing advance
-					     RA_template->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],
-		     &cc[CC_id].CCCH_pdu.payload[0],
-		     rrc_sdu_length);
-
-	    // DL request
-	      eNB->TX_req[CC_id].sfn_sf                                             = (frameP<<3)+subframeP;
-	      TX_req                                                                = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus]; 		     	      
-	      TX_req->pdu_length                                                    = rrc_sdu_length;
-	      TX_req->pdu_index                                                     = eNB->pdu_index[CC_id]++;
-	      TX_req->num_segments                                                  = 1;
-	      TX_req->segments[0].segment_length                                    = rrc_sdu_length;
-	      TX_req->segments[0].segment_data                                      = eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0];
-	      eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
-	      
-              T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP), T_INT(CC_id), T_INT(RA_template->rnti), T_INT(frameP), T_INT(subframeP),
-                T_INT(0 /*harq_pid always 0?*/), T_BUFFER(&eNB->UE_list.DLSCH_pdu[CC_id][0][UE_id].payload[0], TBsize));
-	      
-	      if (opt_enabled==1) {
-		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->frame, eNB->subframe,0,0);
-		LOG_D(OPT,"[eNB %d][DLSCH] CC_id %d Frame %d trace pdu for rnti %x with size %d\n",
-		      module_idP, CC_id, frameP, UE_RNTI(module_idP,UE_id), rrc_sdu_length);
-	      }
-	      
-	    }
-	  }
-
-          //try here
-        }
-
-      } else if (RA_template->wait_ack_Msg4==1) {
-	// check HARQ status and retransmit if necessary
-	LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Checking if Msg4 was acknowledged: \tn",
-	      module_idP,CC_id,frameP,subframeP);
-	// Get candidate harq_pid from PHY
-
-	UE_id = find_UE_id(module_idP,RA_template->rnti);
-	AssertFatal(UE_id>=0,"Can't find UE for t-crnti\n");
-	round = UE_list->UE_sched_ctrl[UE_id].round[CC_id];
-
-	if (round>0) {
-	  //RA_template->wait_ack_Msg4++;
-	  // we have to schedule a retransmission
-	  
-	  first_rb=0;
-	  vrb_map[first_rb] = 1;
-	  vrb_map[first_rb+1] = 1;
-	  vrb_map[first_rb+2] = 1;
-	  vrb_map[first_rb+3] = 1;
-
-	  memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
-	  dl_config_pdu->pdu_type                                                          = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE; 
-	  dl_config_pdu->pdu_size                                                          = (uint8_t)(2+sizeof(nfapi_dl_config_dci_dl_pdu));
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format                             = NFAPI_DL_DCI_FORMAT_1A;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level                      = 4;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti                                   = RA_template->rnti;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type                              = 1;    // C-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power                     = 6000; // equal to RS power
-	  
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process                           = 0;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc                                    = 1; // no TPC
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1                   = 1;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1                   = 0;
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
-	  
-	  // Compute MCS for 3 PRB
-	  msg4_header = 1+6+1;  // CR header, CR CE, SDU header
-	  
-	  
-	  if ((rrc_sdu_length+msg4_header) <= 22) {
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 4;
-	    TBsize = 22;
-	  } else if ((rrc_sdu_length+msg4_header) <= 28) {
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 5;
-	    TBsize = 28;
-	  } else if ((rrc_sdu_length+msg4_header) <= 32) {
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 6;
-	    TBsize = 32;
-	  } else if ((rrc_sdu_length+msg4_header) <= 41) {
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 7;
-	    TBsize = 41;
-	  } else if ((rrc_sdu_length+msg4_header) <= 49) {
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 8;
-	    TBsize = 49;
-	  } else if ((rrc_sdu_length+msg4_header) <= 57) {
-	    dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 9;
-	    TBsize = 57;
-	  }
-	  
-	  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding= getRIV(N_RB_DL,first_rb,4);
-	  
-	  if (!CCE_allocation_infeasible(module_idP,CC_id,0,subframeP,dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,RA_template->rnti)) {
-	    dl_req->number_dci++;
-	    dl_req->number_pdu++;
-		  
-	    LOG_I(MAC,"msg4 retransmission for rnti %x (round %d) fsf %d/%d\n", RA_template->rnti, round, frameP, subframeP);
-	  }
+	    } //repetition_count==0 && SF condition met
+	    if (RA_template->msg4_mpdcch_repetition_cnt>0) { // we're in a stream of repetitions
+	      RA_template->msg4_mpdcch_repetition_cnt++;	      
+	      if (RA_template->msg4_mpdcch_repetition_cnt==reps) { // this is the last mpdcch repetition
+		if (cc[CC_id].tdd_Config==NULL) { // FDD case
+		  // wait 2 subframes for PDSCH transmission
+		  if (subframeP>7) RA_template->Msg4_frame = (frameP+1)&1023;
+		  else             RA_template->Msg4_frame = frameP;
+		  RA_template->Msg4_subframe               = (subframeP+2)%10; 
+		}
+		else {
+		  AssertFatal(1==0,"TDD case not done yet\n");
+		}
+	      } // mpdcch_repetition_count == reps
+	      if ((RA_template->Msg4_frame == frameP) && (RA_template->Msg4_subframe == subframeP)) {
+		// Program PDSCH
+		RA_template->generate_rar = 0;	 
+		
+		LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Generating Msg4 BR with RRC Piggyback (RA proc %d, RNTI %x)\n",
+		      module_idP, CC_id, frameP, subframeP,i,RA_template->rnti);
+		
+		dl_config_pdu                                                                  = &dl_req->dl_config_pdu_list[dl_req->number_pdu]; 
+		memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+		dl_config_pdu->pdu_type                                                        = NFAPI_DL_CONFIG_DLSCH_PDU_TYPE; 
+		dl_config_pdu->pdu_size                                                        = (uint8_t)(2+sizeof(nfapi_dl_config_dlsch_pdu));
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index                              = eNB->pdu_index[CC_id];
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.rnti                                   = RA_template->rnti;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_allocation_type               = 2;   // format 1A/1B/1D
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.virtual_resource_block_assignment_flag = 0;   // localized
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.resource_block_coding                  = getRIV(N_RB_DL,first_rb,6);
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.modulation                             = 2; //QPSK
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.redundancy_version                     = 0;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_blocks                       = 1;// first block
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transport_block_to_codeword_swap_flag  = 0;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_scheme                    = (cc->p_eNB==1 ) ? 0 : 1;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_layers                       = 1;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.number_of_subbands                     = 1;
+		//	dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.codebook_index                         = ;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ue_category_capacity                   = 1;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pa                                     = 4; // 0 dB
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.delta_power_offset_index               = 0;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.ngap                                   = 0;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.nprb                                   = get_subbandsize(cc->mib->message.dl_Bandwidth); // ignored
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.transmission_mode                      = (cc->p_eNB==1 ) ? 1 : 2;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_prb_per_subband                 = 1;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.num_bf_vector                          = 1;
+		//	dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.bf_vector                    = ; 
+		
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.ue_type                               = (RA_template->rach_resource_type < 3) ? 1 : 2;;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.pdsch_payload_type                    = 2;  // not SI message
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.initial_transmission_sf_io            = (10*frameP)+subframeP;
+		dl_config_pdu->dlsch_pdu.dlsch_pdu_rel13.drms_table_flag                       = 0;
+		dl_req->number_pdu++;
+		
+		RA_template->generate_Msg4=0;
+		RA_template->wait_ack_Msg4=1;
+		RA_template->RA_active = FALSE;
+		lcid=0;
+		
+		// set HARQ process 0 round to 0 for this UE
+		UE_list->UE_sched_ctrl[UE_id].round[CC_id] = 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] CC_id %d Frame %d subframeP %d Msg4 : TBS %d, sdu_len %d, msg4_header %d, msg4_padding %d, msg4_post_padding %d\n",
+		      module_idP,CC_id,frameP,subframeP,TBsize,rrc_sdu_length,msg4_header,msg4_padding,msg4_post_padding);
+		DevAssert( UE_id != UE_INDEX_INVALID ); // FIXME not sure how to gracefully return
+		// CHECK THIS: &cc[CC_id].CCCH_pdu.payload[0]
+		offset = generate_dlsch_header((unsigned char*)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
+					       1,                           //num_sdus
+					       (unsigned short*)&rrc_sdu_length,             //
+					       &lcid,                       // sdu_lcid
+					       255,                         // no drx
+					       0,                           // no timing advance
+					       RA_template->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],
+		       &cc[CC_id].CCCH_pdu.payload[0],
+		       rrc_sdu_length);
+		
+		// DL request
+		eNB->TX_req[CC_id].sfn_sf                                             = (frameP<<3)+subframeP;
+		TX_req                                                                = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus]; 		     	      
+		TX_req->pdu_length                                                    = rrc_sdu_length;
+		TX_req->pdu_index                                                     = eNB->pdu_index[CC_id]++;
+		TX_req->num_segments                                                  = 1;
+		TX_req->segments[0].segment_length                                    = rrc_sdu_length;
+		TX_req->segments[0].segment_data                                      = eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0];
+		eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
+		
+		T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP), T_INT(CC_id), T_INT(RA_template->rnti), T_INT(frameP), T_INT(subframeP),
+		  T_INT(0 /*harq_pid always 0?*/), T_BUFFER(&eNB->UE_list.DLSCH_pdu[CC_id][0][UE_id].payload[0], TBsize));
+		
+		if (opt_enabled==1) {
+		  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->frame, eNB->subframe,0,0);
+		  LOG_D(OPT,"[eNB %d][DLSCH] CC_id %d Frame %d trace pdu for rnti %x with size %d\n",
+			module_idP, CC_id, frameP, UE_RNTI(module_idP,UE_id), rrc_sdu_length);
+		}
+	      } // Msg4 frame/subframe
+	    } // msg4_mpdcch_repetition_count
+	  } // rach_resource_type > 0 
 	  else
-	    LOG_I(MAC,"msg4 retransmission for rnti %x (round %d) fsf %d/%d CCE allocation failed!\n", RA_template->rnti, round, frameP, subframeP);
-	  LOG_W(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Msg4 not acknowledged, adding ue specific dci (rnti %x) for RA (Msg4 Retransmission)\n",
-		module_idP,CC_id,frameP,subframeP,RA_template->rnti);
-	} else {
-	  LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d : Msg4 acknowledged\n",module_idP,CC_id,frameP,subframeP);
-	  RA_template->wait_ack_Msg4=0;
-	  RA_template->RA_active=FALSE;
+#endif
+	    {
+	      if ((RA_template->Msg4_frame == frameP) && (RA_template->Msg4_subframe == subframeP)) {	      
+		LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Generating Msg4 with RRC Piggyback (RA proc %d, RNTI %x)\n",
+		      module_idP, CC_id, frameP, subframeP,i,RA_template->rnti);
+		
+		first_rb=0;
+		
+		vrb_map[first_rb] = 1;
+		vrb_map[first_rb+1] = 1;
+		vrb_map[first_rb+2] = 1;
+		vrb_map[first_rb+3] = 1;
+		
+		
+		memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+		dl_config_pdu->pdu_type                                                          = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE; 
+		dl_config_pdu->pdu_size                                                          = (uint8_t)(2+sizeof(nfapi_dl_config_dci_dl_pdu));
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format                             = NFAPI_DL_DCI_FORMAT_1A;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level                      = 4;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti                                   = RA_template->rnti;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type                              = 1;    // C-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power                     = 6000; // equal to RS power
+		
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process                           = 0;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc                                    = 1; // no TPC
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1                   = 1;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1                   = 0;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
+		
+		// Compute MCS for 3 PRB
+		msg4_header = 1+6+1;  // CR header, CR CE, SDU header
+		
+		
+		if ((rrc_sdu_length+msg4_header) <= 22) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 4;
+		  TBsize = 22;
+		} else if ((rrc_sdu_length+msg4_header) <= 28) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 5;
+		  TBsize = 28;
+		} else if ((rrc_sdu_length+msg4_header) <= 32) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 6;
+		  TBsize = 32;
+		} else if ((rrc_sdu_length+msg4_header) <= 41) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 7;
+		  TBsize = 41;
+		} else if ((rrc_sdu_length+msg4_header) <= 49) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 8;
+		  TBsize = 49;
+		} else if ((rrc_sdu_length+msg4_header) <= 57) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 9;
+		  TBsize = 57;
+		}
+		
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding= getRIV(N_RB_DL,first_rb,4);
+		
+		if (!CCE_allocation_infeasible(module_idP,CC_id,0,subframeP,dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,RA_template->rnti)) {
+		  dl_req->number_dci++;
+		  dl_req->number_pdu++;
+		  
+		  RA_template->generate_Msg4=0;
+		  RA_template->wait_ack_Msg4=1;
+		  RA_template->RA_active = FALSE;
+		  lcid=0;
+		  
+		  // set HARQ process 0 round to 0 for this UE
+		  UE_list->UE_sched_ctrl[UE_id].round[CC_id] = 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] CC_id %d Frame %d subframeP %d Msg4 : TBS %d, sdu_len %d, msg4_header %d, msg4_padding %d, msg4_post_padding %d\n",
+			module_idP,CC_id,frameP,subframeP,TBsize,rrc_sdu_length,msg4_header,msg4_padding,msg4_post_padding);
+		  DevAssert( UE_id != UE_INDEX_INVALID ); // FIXME not sure how to gracefully return
+		  // CHECK THIS: &cc[CC_id].CCCH_pdu.payload[0]
+		  offset = generate_dlsch_header((unsigned char*)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
+						 1,                           //num_sdus
+						 (unsigned short*)&rrc_sdu_length,             //
+						 &lcid,                       // sdu_lcid
+						 255,                         // no drx
+						 0,                           // no timing advance
+						 RA_template->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],
+			 &cc[CC_id].CCCH_pdu.payload[0],
+			 rrc_sdu_length);
+		  
+		  // DL request
+		  eNB->TX_req[CC_id].sfn_sf                                             = (frameP<<3)+subframeP;
+		  TX_req                                                                = &eNB->TX_req[CC_id].tx_request_body.tx_pdu_list[eNB->TX_req[CC_id].tx_request_body.number_of_pdus]; 		     	      
+		  TX_req->pdu_length                                                    = rrc_sdu_length;
+		  TX_req->pdu_index                                                     = eNB->pdu_index[CC_id]++;
+		  TX_req->num_segments                                                  = 1;
+		  TX_req->segments[0].segment_length                                    = rrc_sdu_length;
+		  TX_req->segments[0].segment_data                                      = eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0];
+		  eNB->TX_req[CC_id].tx_request_body.number_of_pdus++;
+		  
+		  T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP), T_INT(CC_id), T_INT(RA_template->rnti), T_INT(frameP), T_INT(subframeP),
+		    T_INT(0 /*harq_pid always 0?*/), T_BUFFER(&eNB->UE_list.DLSCH_pdu[CC_id][0][UE_id].payload[0], TBsize));
+		  
+		  if (opt_enabled==1) {
+		    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->frame, eNB->subframe,0,0);
+		    LOG_D(OPT,"[eNB %d][DLSCH] CC_id %d Frame %d trace pdu for rnti %x with size %d\n",
+			  module_idP, CC_id, frameP, UE_RNTI(module_idP,UE_id), rrc_sdu_length);
+		  }
+		  
+		} // CCE Allocation feasible
+	      } // msg4 frame/subframe
+	    } // else rach_resource_type
+	} else if (RA_template->wait_ack_Msg4==1) {
+	// check HARQ status and retransmit if necessary
+	  LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Checking if Msg4 was acknowledged: \tn",
+		module_idP,CC_id,frameP,subframeP);
+	  // Get candidate harq_pid from PHY
+	  
 	  UE_id = find_UE_id(module_idP,RA_template->rnti);
-	  DevAssert( UE_id != -1 );
-	  eNB->UE_list.UE_template[UE_PCCID(module_idP,UE_id)][UE_id].configured=TRUE;
-	}
-      }
+	  AssertFatal(UE_id>=0,"Can't find UE for t-crnti\n");
+	  round = UE_list->UE_sched_ctrl[UE_id].round[CC_id];
+	  
+	  if (round>0) {
+
+#ifdef Rel14
+	    AssertFatal(1==0,"Msg4 Retransmissions not handled yet for BL/CE UEs\n");
+#endif 
+	    {
+	      if ( (RA_template->Msg4_frame == frameP) && (RA_template->Msg4_subframe == subframeP)) {	       
+
+		//RA_template->wait_ack_Msg4++;
+		// we have to schedule a retransmission
+		
+		first_rb=0;
+		vrb_map[first_rb] = 1;
+		vrb_map[first_rb+1] = 1;
+		vrb_map[first_rb+2] = 1;
+		vrb_map[first_rb+3] = 1;
+		
+		memset((void*)dl_config_pdu,0,sizeof(nfapi_dl_config_request_pdu_t));
+		dl_config_pdu->pdu_type                                                          = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE; 
+		dl_config_pdu->pdu_size                                                          = (uint8_t)(2+sizeof(nfapi_dl_config_dci_dl_pdu));
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format                             = NFAPI_DL_DCI_FORMAT_1A;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level                      = 4;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti                                   = RA_template->rnti;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type                              = 1;    // C-RNTI : see Table 4-10 from SCF082 - nFAPI specifications
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power                     = 6000; // equal to RS power
+		
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.harq_process                           = 0;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tpc                                    = 1; // no TPC
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.new_data_indicator_1                   = 1;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.redundancy_version_1                   = 0;
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.virtual_resource_block_assignment_flag = 0;
+		
+		// Compute MCS for 3 PRB
+		msg4_header = 1+6+1;  // CR header, CR CE, SDU header
+		
+		
+		if ((rrc_sdu_length+msg4_header) <= 22) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 4;
+		  TBsize = 22;
+		} else if ((rrc_sdu_length+msg4_header) <= 28) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 5;
+		  TBsize = 28;
+		} else if ((rrc_sdu_length+msg4_header) <= 32) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 6;
+		  TBsize = 32;
+		} else if ((rrc_sdu_length+msg4_header) <= 41) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 7;
+		  TBsize = 41;
+		} else if ((rrc_sdu_length+msg4_header) <= 49) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 8;
+		  TBsize = 49;
+		} else if ((rrc_sdu_length+msg4_header) <= 57) {
+		  dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.mcs_1                       = 9;
+		  TBsize = 57;
+		}
+		
+		dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding= getRIV(N_RB_DL,first_rb,4);
+		
+		if (!CCE_allocation_infeasible(module_idP,CC_id,0,subframeP,dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,RA_template->rnti)) {
+		  dl_req->number_dci++;
+		  dl_req->number_pdu++;
+		  
+		  LOG_I(MAC,"msg4 retransmission for rnti %x (round %d) fsf %d/%d\n", RA_template->rnti, round, frameP, subframeP);
+		}
+		else
+		  LOG_I(MAC,"msg4 retransmission for rnti %x (round %d) fsf %d/%d CCE allocation failed!\n", RA_template->rnti, round, frameP, subframeP);
+		LOG_W(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Msg4 not acknowledged, adding ue specific dci (rnti %x) for RA (Msg4 Retransmission)\n",
+		      module_idP,CC_id,frameP,subframeP,RA_template->rnti);
+	      }
+	    }
+ 
+	  } else {
+	    LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d : Msg4 acknowledged\n",module_idP,CC_id,frameP,subframeP);
+	    RA_template->wait_ack_Msg4=0;
+	    RA_template->RA_active=FALSE;
+	    UE_id = find_UE_id(module_idP,RA_template->rnti);
+	    DevAssert( UE_id != -1 );
+	    eNB->UE_list.UE_template[UE_PCCID(module_idP,UE_id)][UE_id].configured=TRUE;
+	  }
+	} //wait_ack_Msg4 == 1
+      } // RA_active == TRUE
     } // for i=0 .. N_RA_PROC-1 
   } // CC_id
-
+  
   stop_meas(&eNB->schedule_ra);
 }
 
+
 // handles the event of MSG1 reception
-void initiate_ra_proc(module_id_t module_idP, int CC_id,frame_t frameP, sub_frame_t subframeP,uint16_t preamble_index,int16_t timing_offset,uint16_t ra_rnti)
+void initiate_ra_proc(module_id_t module_idP, 
+		      int CC_id,
+		      frame_t frameP, 
+		      sub_frame_t subframeP,
+		      uint16_t preamble_index,
+		      int16_t timing_offset,
+		      uint16_t ra_rnti
+#ifdef Rel14
+		      ,
+		      uint8_t rach_resource_type
+#endif
+		      )
 {
 
   uint8_t i;
   RA_TEMPLATE *RA_template = (RA_TEMPLATE *)&RC.mac[module_idP]->common_channels[CC_id].RA_template[0];
 
   LOG_D(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d Initiating RA procedure for preamble index %d\n",module_idP,CC_id,frameP,preamble_index);
+#ifdef Rel14
+		      LOG_D(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d PRACH resource type %d\n",module_idP,CC_id,frameP,preamble_index,rach_resource_type);
+#endif
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_INITIATE_RA_PROC,1);
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_INITIATE_RA_PROC,0);
@@ -518,12 +910,17 @@ void initiate_ra_proc(module_id_t module_idP, int CC_id,frame_t frameP, sub_fram
     if (RA_template[i].RA_active==FALSE &&
         RA_template[i].wait_ack_Msg4 == 0) {
       int loop = 0;
-      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;
-      RA_template[i].preamble_subframe = subframeP;
+      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;
+      RA_template[i].preamble_subframe  = subframeP;
+#ifdef Rel14
+      RA_template[i].rach_resource_type = rach_resource_type;
+      RA_template[i].msg2_mpdcch_repetition_cnt = 0;		      
+      RA_template[i].msg4_mpdcch_repetition_cnt = 0;		      
+#endif
       /* TODO: find better procedure to allocate RNTI */
       do {
         RA_template[i].rnti = taus();
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_bch.c b/openair2/LAYER2/MAC/eNB_scheduler_bch.c
index f2ace8d328..7f4fd19db3 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_bch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_bch.c
@@ -496,12 +496,12 @@ void schedule_mib(module_id_t   module_idP,
 				      module_idP,
 				      0); // not used in this case
 
-    LOG_I(MAC,"Frame %d, subframe %d: BCH PDU length %d\n",
+    LOG_D(MAC,"Frame %d, subframe %d: BCH PDU length %d\n",
 	  frameP,subframeP,mib_sdu_length);
 
     if (mib_sdu_length > 0) {
 
-      LOG_I(MAC,"Frame %d, subframe %d: Adding BCH PDU in position %d (length %d)\n",
+      LOG_D(MAC,"Frame %d, subframe %d: Adding BCH PDU in position %d (length %d)\n",
 	    frameP,subframeP,dl_req->number_pdu,mib_sdu_length);
 
       dl_config_pdu                                                         = &dl_req->dl_config_pdu_list[dl_req->number_pdu]; 
@@ -513,7 +513,7 @@ void schedule_mib(module_id_t   module_idP,
       dl_config_pdu->bch_pdu.bch_pdu_rel8.transmission_power                = 6000;
       dl_req->number_pdu++;
 
-      LOG_I(MAC,"eNB->DL_req[0].number_pdu %d (%p)\n",
+      LOG_D(MAC,"eNB->DL_req[0].number_pdu %d (%p)\n",
 	    dl_req->number_pdu,&dl_req->number_pdu);
       // DL request
 
@@ -647,7 +647,7 @@ schedule_SI(
       dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding       = getRIV(N_RB_DL,first_rb,4);      
 
       if (!CCE_allocation_infeasible(module_idP,CC_id,1,subframeP,dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,SI_RNTI)) {
-	LOG_I(MAC,"Frame %d: Subframe %d : Adding common DCI for S_RNTI\n",
+	LOG_D(MAC,"Frame %d: Subframe %d : Adding common DCI for S_RNTI\n",
 	      frameP,subframeP);
 	dl_req->number_dci++;
 	dl_req->number_pdu++;
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index 6961013983..dceff068d3 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -208,6 +208,8 @@ void get_Msg3alloc(COMMON_channels_t *cc,
   }
 }
 
+
+
 void get_Msg3allocret(COMMON_channels_t *cc,
 		      unsigned char current_subframe,
 		      unsigned int current_frame,
@@ -401,6 +403,67 @@ uint8_t get_Msg3harqpid(COMMON_channels_t *cc,
 
 }
 
+#ifdef Rel14
+
+int get_numnarrowbands(long dl_Bandwidth) {
+  int nb_tab[6] = {1,2,4,8,12,16};
+
+  AssertFatal(dl_Bandwidth<7 || dl_Bandwidth>=0,"dl_Bandwidth not in [0..6]\n");
+  return(nb_tab[dl_Bandwidth]);
+}
+
+int get_numnarrowbandbits(long dl_Bandwidth) {
+  int nbbits_tab[6] = {0,1,2,3,4,4};
+
+  AssertFatal(dl_Bandwidth<7 || dl_Bandwidth>=0,"dl_Bandwidth not in [0..6]\n");
+  return(nbbits_tab[dl_Bandwidth]);
+}
+
+//This implements the frame/subframe condition for first subframe of MPDCCH transmission (Section 9.1.5 36.213, Rel 13/14)
+int startSF_fdd_RA_times2[8] = {2,3,4,5,8,10,16,20};
+int startSF_tdd_RA[7]        = {1,2,4,5,8,10,20};
+
+int mpdcch_sf_condition(eNB_MAC_INST *eNB,int CC_id, frame_t frameP,sub_frame_t subframeP,int rmax,MPDCCH_TYPES_t mpdcch_type) {
+
+  struct PRACH_ConfigSIB_v1310 *ext4_prach = eNB->common_channels[CC_id].radioResourceConfigCommon_BR->ext4->prach_ConfigCommon_v1310;
+  int T;
+
+  switch (mpdcch_type) {
+  case TYPE0:
+    AssertFatal(1==0,"MPDCCH Type 0 not handled yet\n");
+    break;
+  case TYPE1:
+    AssertFatal(1==0,"MPDCCH Type 1 not handled yet\n");
+    break;
+  case TYPE1A:
+    AssertFatal(1==0,"MPDCCH Type 1A not handled yet\n");
+    break;
+  case TYPE2: // RAR
+    AssertFatal(ext4_prach->mpdcch_startSF_CSS_RA_r13!=NULL,
+		"mpdcch_startSF_CSS_RA_r13 is null\n");
+    if (eNB->common_channels[CC_id].tdd_Config==NULL) //FDD
+      T = rmax*startSF_fdd_RA_times2[ext4_prach->mpdcch_startSF_CSS_RA_r13->choice.fdd_r13]>>1;
+    else //TDD
+      T = rmax*startSF_tdd_RA[ext4_prach->mpdcch_startSF_CSS_RA_r13->choice.tdd_r13];
+    break;
+  case TYPE2A:
+    AssertFatal(1==0,"MPDCCH Type 2A not handled yet\n");
+    break;
+  case TYPEUESPEC:
+    AssertFatal(1==0,"MPDCCH Type UESPEC not handled yet\n");
+    break;
+  default:
+    return(0);
+  }
+
+  if (((10*frameP) + subframeP)%T == 0) return(1);
+  else return(0);
+
+}
+
+
+#endif
+
 //------------------------------------------------------------------------------
 void init_ue_sched_info(void)
 //------------------------------------------------------------------------------
@@ -645,7 +708,6 @@ printf("MAC: cannot remove UE rnti %x\n", rntiP);
 
   pCC_id = UE_PCCID(mod_idP,UE_id);
 
-printf("MAC: remove UE %d rnti %x\n", UE_id, rntiP);
   LOG_I(MAC,"Removing UE %d from Primary CC_id %d (rnti %x)\n",UE_id,pCC_id, rntiP);
   dump_ue_list(UE_list,0);
 
@@ -1331,14 +1393,14 @@ int get_nCCE_offset(int *CCE_table,
     nb_candidates = (L==4) ? 4 : 2;
     nb_candidates = min(nb_candidates,nCCE/L);
 
-    printf("Common DCI nb_candidates %d, L %d\n",nb_candidates,L);
+    //    printf("Common DCI nb_candidates %d, L %d\n",nb_candidates,L);
 
     for (m = nb_candidates-1 ; m >=0 ; m--) {
 
       search_space_free = 1;
       for (l=0; l<L; l++) {
 
-	printf("CCE_table[%d] %d\n",(m*L)+l,CCE_table[(m*L)+l]);
+	//	printf("CCE_table[%d] %d\n",(m*L)+l,CCE_table[(m*L)+l]);
         if (CCE_table[(m*L) + l] == 1) {
           search_space_free = 0;
           break;
@@ -1592,7 +1654,7 @@ int allocate_CCEs(int module_idP,
   int i,j,idci;
   int nCCE=0;
 
-  LOG_I(MAC,"Allocate CCEs subframe %d, test %d : (DL %d,UL %d)\n",subframeP,test_onlyP,DL_req->number_dci,HI_DCI0_req->number_of_dci);
+  LOG_D(MAC,"Allocate CCEs subframe %d, test %d : (DL %d,UL %d)\n",subframeP,test_onlyP,DL_req->number_dci,HI_DCI0_req->number_of_dci);
   DL_req->number_pdcch_ofdm_symbols=1;
 
 try_again:
@@ -1603,7 +1665,7 @@ try_again:
     // allocate DL common DCIs first
     if ((dl_config_pdu[i].pdu_type == NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)&&
 	(dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti_type==2)) {
-      LOG_I(MAC,"Trying to allocate COMMON DCI %d/%d (%d,%d) : rnti %x, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+      LOG_D(MAC,"Trying to allocate COMMON DCI %d/%d (%d,%d) : rnti %x, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
 	    idci,DL_req->number_dci+HI_DCI0_req->number_of_dci,
 	    DL_req->number_dci,HI_DCI0_req->number_of_dci,
 	    dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti,
@@ -1627,11 +1689,11 @@ try_again:
 			     subframeP);
       if (fCCE == -1) {
 	if (DL_req->number_pdcch_ofdm_symbols == 3) {
-	  LOG_I(MAC,"subframe %d: Dropping Allocation for RNTI %x\n",
+	  LOG_D(MAC,"subframe %d: Dropping Allocation for RNTI %x\n",
 		subframeP,dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.rnti);
 	  for (j=0;j<=i;j++){
 	    if (dl_config_pdu[j].pdu_type == NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE)
-	      LOG_I(MAC,"DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+	      LOG_D(MAC,"DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
 		    j,DL_req->number_dci+HI_DCI0_req->number_of_dci,
 		    DL_req->number_dci,HI_DCI0_req->number_of_dci,
 		    dl_config_pdu[j].dci_dl_pdu.dci_dl_pdu_rel8.rnti,
@@ -1652,7 +1714,7 @@ try_again:
       LOG_D(MAC,"Allocating at nCCE %d\n",fCCE);
       if (test_onlyP == 0) {
 	dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.cce_idx=fCCE;
-	LOG_I(MAC,"Allocate COMMON DCI CCEs subframe %d, test %d => L %d fCCE %d\n",subframeP,test_onlyP,dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,fCCE);
+	LOG_D(MAC,"Allocate COMMON DCI CCEs subframe %d, test %d => L %d fCCE %d\n",subframeP,test_onlyP,dl_config_pdu[i].dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level,fCCE);
       }
       idci++;
     }
@@ -1687,11 +1749,11 @@ try_again:
 			     subframeP);
       if (fCCE == -1) {
 	if (DL_req->number_pdcch_ofdm_symbols == 3) {
-	  LOG_I(MAC,"subframe %d: Dropping Allocation for RNTI %x\n",
+	  LOG_D(MAC,"subframe %d: Dropping Allocation for RNTI %x\n",
 		subframeP,hi_dci0_pdu[i].dci_pdu.dci_pdu_rel8.rnti);
 	  for (j=0;j<=i;j++){
 	    if (hi_dci0_pdu[j].pdu_type == NFAPI_HI_DCI0_DCI_PDU_TYPE)
-	      LOG_I(MAC,"DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
+	      LOG_D(MAC,"DCI %d/%d (%d,%d) : rnti %x dci format %d, aggreg %d nCCE %d / %d (num_pdcch_symbols %d)\n",
 		    j,DL_req->number_dci+HI_DCI0_req->number_of_dci,
 		    DL_req->number_dci,HI_DCI0_req->number_of_dci,
 		    hi_dci0_pdu[j].dci_pdu.dci_pdu_rel8.rnti,
@@ -1826,7 +1888,7 @@ void SR_indication(module_id_t mod_idP, int cc_idP, frame_t frameP, rnti_t rntiP
  
   if (UE_id  != -1) {
     if (mac_eNB_get_rrc_status(mod_idP,UE_RNTI(mod_idP,UE_id)) < RRC_CONNECTED)
-      LOG_I(MAC,"[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d on CC_id %d\n",mod_idP,rntiP,frameP,subframeP, UE_id,cc_idP);
+      LOG_D(MAC,"[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d on CC_id %d\n",mod_idP,rntiP,frameP,subframeP, UE_id,cc_idP);
     UE_list->UE_template[cc_idP][UE_id].ul_SR = 1;
     UE_list->UE_template[cc_idP][UE_id].ul_active = TRUE;
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SR_INDICATION,1);
diff --git a/openair2/LAYER2/MAC/main.c b/openair2/LAYER2/MAC/main.c
index ef47b42736..6e5fa91f14 100644
--- a/openair2/LAYER2/MAC/main.c
+++ b/openair2/LAYER2/MAC/main.c
@@ -171,6 +171,7 @@ int mac_top_init_eNB()
 		  RC.nb_macrlc_inst*sizeof(eNB_MAC_INST*),RC.nb_macrlc_inst,sizeof(eNB_MAC_INST));
       LOG_D(MAC,"[MAIN] ALLOCATE %zu Bytes for %d eNB_MAC_INST @ %p\n",sizeof(eNB_MAC_INST),RC.nb_macrlc_inst,RC.mac);
       bzero(RC.mac[i],sizeof(eNB_MAC_INST));
+      RC.mac[i]->Mod_id = Mod_id;
       for (j=0;j<MAX_NUM_CCs;j++) {
 	RC.mac[i]->DL_req[j].dl_config_request_body.dl_config_pdu_list      = RC.mac[i]->dl_config_pdu_list[j];
 	RC.mac[i]->UL_req[j].ul_config_request_body.ul_config_pdu_list      = RC.mac[i]->ul_config_pdu_list[j];
@@ -187,6 +188,7 @@ int mac_top_init_eNB()
   for(Mod_id=0; Mod_id<RC.nb_macrlc_inst; Mod_id++) {
     mac = RC.mac[Mod_id];
 
+
     mac->if_inst                = IF_Module_init(Mod_id);
 
     UE_list = &mac->UE_list;
diff --git a/openair2/LAYER2/MAC/proto.h b/openair2/LAYER2/MAC/proto.h
index 83f07bd306..63e717f90e 100644
--- a/openair2/LAYER2/MAC/proto.h
+++ b/openair2/LAYER2/MAC/proto.h
@@ -205,8 +205,15 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, uint8_t cooperation_flag,
 @param Mod_id Instance ID of eNB
 @param preamble_index index of the received RA request
 @param timing_offset Offset in samples of the received PRACH w.r.t. eNB timing. This is used to
+@param rnti RA rnti corresponding to this PRACH preamble
+@param rach_resource type (0=non BL/CE,1 CE level 0,2 CE level 1, 3 CE level 2,4 CE level 3)
 */
-void initiate_ra_proc(module_id_t module_idP,int CC_id,frame_t frameP, sub_frame_t subframeP, uint16_t preamble_index,int16_t timing_offset,uint16_t rnti);
+void initiate_ra_proc(module_id_t module_idP,int CC_id,frame_t frameP, sub_frame_t subframeP, uint16_t preamble_index,int16_t timing_offset,uint16_t rnti
+#ifdef Rel14
+		      ,
+		      uint8_t rach_resource_type
+#endif
+		      );
 
 /* \brief Function in eNB to fill RAR pdu when requested by PHY.  This provides a single RAR SDU for the moment and returns the t-CRNTI.
 @param Mod_id Instance ID of eNB
diff --git a/openair2/LAYER2/MAC/rar_tools.c b/openair2/LAYER2/MAC/rar_tools.c
index 8ccfa81ceb..d40c3280ef 100644
--- a/openair2/LAYER2/MAC/rar_tools.c
+++ b/openair2/LAYER2/MAC/rar_tools.c
@@ -129,6 +129,96 @@ unsigned short fill_rar(
   return(RC.mac[module_idP]->common_channels[CC_id].RA_template[ra_idx].rnti);
 }
 
+#ifdef Rel14
+//------------------------------------------------------------------------------
+unsigned short fill_rar_br(eNB_MAC_INST *eNB,
+			   const int          CC_id,
+			   const int          ra_idx,
+			   const frame_t      frameP,
+			   const sub_frame_t  subframeP,
+			   uint8_t*    const  dlsch_buffer,
+			   const uint8_t      ce_level
+)
+//------------------------------------------------------------------------------
+{
+
+  RA_HEADER_RAPID *rarh = (RA_HEADER_RAPID *)dlsch_buffer;
+
+  uint8_t *rar = (uint8_t *)(dlsch_buffer+1);
+  int i;
+  uint8_t nb,rballoc,reps;
+  uint8_t mcs,TPC,ULdelay,cqireq;
+  COMMON_channels_t *cc = &eNB->common_channels[CC_id];
+  int input_buffer_length;
+
+
+  AssertFatal(CC_id < MAX_NUM_CCs, "CC_id %u < MAX_NUM_CCs %u", CC_id, MAX_NUM_CCs);
+
+  AssertFatal(ra_idx >= 0 && ra_idx < 4, "RA index not in [0..3]\n");
+
+  // subheader fixed
+  rarh->E                     = 0; // First and last RAR
+  rarh->T                     = 1; // 0 for E/T/R/R/BI subheader, 1 for E/T/RAPID subheader
+  rarh->RAPID                 = cc->RA_template[ra_idx].preamble_index; // Respond to Preamble 0 only for the moment
+  cc->RA_template[ra_idx].timing_offset /= 16; //T_A = N_TA/16, where N_TA should be on a 30.72Msps
+  rar[0] = (uint8_t)(cc->RA_template[ra_idx].timing_offset>>(2+4)); // 7 MSBs of timing advance + divide by 4
+  rar[1] = (uint8_t)(cc->RA_template[ra_idx].timing_offset<<(4-2))&0xf0; // 4 LSBs of timing advance + divide by 4
+
+  int N_NB_index;
+
+  AssertFatal(1==0,"RAR for BL/CE Still to be finished ...\n"); 
+
+  // Copy the Msg2 narrowband
+  cc->RA_template[ra_idx].msg34_narrowband = cc->RA_template[ra_idx].msg2_narrowband; 
+
+  if (ce_level<2) { //CE Level 0,1, CEmodeA
+    input_buffer_length =6;
+
+    N_NB_index = get_numnarrowbandbits(cc->mib->message.dl_Bandwidth);
+
+    rar[4] = (uint8_t)(cc->RA_template[ra_idx].rnti>>8);
+    rar[5] = (uint8_t)(cc->RA_template[ra_idx].rnti&0xff);
+    //cc->RA_template[ra_idx].timing_offset = 0;
+    nb      = 0;
+    rballoc = mac_computeRIV(6,1+ra_idx,1); // one PRB only for UL Grant in position 1+ra_idx within Narrowband
+    rar[1] |= (rballoc&15)<<(4-N_NB_index); // Hopping = 0 (bit 3), 3 MSBs of rballoc
+
+    reps    = 4;
+    mcs     = 7;
+    TPC     = 3; // no power increase
+    ULdelay = 0;
+    cqireq = 0;
+    rar[2] |= ((mcs&0x8)>>3);  // mcs 10
+    rar[3] = (((mcs&0x7)<<5)) | ((TPC&7)<<2) | ((ULdelay&1)<<1) | (cqireq&1);
+  }
+  else { // CE level 2,3 => CEModeB
+
+    input_buffer_length =5;
+
+    rar[3] = (uint8_t)(cc->RA_template[ra_idx].rnti>>8);
+    rar[4] = (uint8_t)(cc->RA_template[ra_idx].rnti&0xff);
+  }
+  LOG_D(MAC,"[RAPROC] CC_id %d Frame %d Generating RAR BR (%02x|%02x.%02x.%02x.%02x.%02x.%02x) for ra_idx %d, CRNTI %x,preamble %d/%d,TIMING OFFSET %d\n",
+        CC_id,
+        frameP,
+        *(uint8_t*)rarh,rar[0],rar[1],rar[2],rar[3],rar[4],rar[5],
+        ra_idx,
+        cc->RA_template[ra_idx].rnti,
+        rarh->RAPID,cc->RA_template[0].preamble_index,
+        cc->RA_template[ra_idx].timing_offset);
+
+  if (opt_enabled) {
+    trace_pdu(1, dlsch_buffer, input_buffer_length, eNB->Mod_id, 2, 1,
+        eNB->frame, eNB->subframe, 0, 0);
+    LOG_D(OPT,"[eNB %d][RAPROC] CC_id %d RAR Frame %d trace pdu for rnti %x and  rapid %d size %d\n",
+          eNB->Mod_id, CC_id, frameP, cc->RA_template[ra_idx].rnti,
+          rarh->RAPID, input_buffer_length);
+  }
+
+  return(cc->RA_template[ra_idx].rnti);
+}
+#endif
+
 //------------------------------------------------------------------------------
 uint16_t
 ue_process_rar(
diff --git a/openair2/PHY_INTERFACE/IF_Module.c b/openair2/PHY_INTERFACE/IF_Module.c
index 4936be61d5..bac5878ece 100644
--- a/openair2/PHY_INTERFACE/IF_Module.c
+++ b/openair2/PHY_INTERFACE/IF_Module.c
@@ -11,20 +11,47 @@ IF_Module_t *if_inst[MAX_IF_MODULES];
 Sched_Rsp_t Sched_INFO[MAX_IF_MODULES][MAX_NUM_CCs];
 
 void handle_rach(UL_IND_t *UL_info) {
+  int i;
 
   if (UL_info->rach_ind.number_of_preambles>0) {
 
     AssertFatal(UL_info->rach_ind.number_of_preambles==1,"More than 1 preamble not supported\n");
     UL_info->rach_ind.number_of_preambles=0;
-    LOG_I(MAC,"Frame %d, Subframe %d Calling initiate_ra_proc\n",UL_info->frame,UL_info->subframe);
+    LOG_D(MAC,"Frame %d, Subframe %d Calling initiate_ra_proc\n",UL_info->frame,UL_info->subframe);
     initiate_ra_proc(UL_info->module_id,
 		     UL_info->CC_id,
 		     UL_info->frame,
 		     UL_info->subframe,
 		     UL_info->rach_ind.preamble_list[0].preamble_rel8.preamble,
 		     UL_info->rach_ind.preamble_list[0].preamble_rel8.timing_advance,
-		     UL_info->rach_ind.preamble_list[0].preamble_rel8.rnti);
+		     UL_info->rach_ind.preamble_list[0].preamble_rel8.rnti
+#ifdef Rel14
+		     ,0
+#endif
+		     );
   }
+
+#ifdef Rel14
+  if (UL_info->rach_ind_br.number_of_preambles>0) {
+
+    AssertFatal(UL_info->rach_ind_br.number_of_preambles<5,"More than 4 preambles not supported\n");
+    for (i=0;i<UL_info->rach_ind_br.number_of_preambles;i++) {
+      AssertFatal(UL_info->rach_ind_br.preamble_list[i].preamble_rel13.rach_resource_type>0,
+		  "Got regular PRACH preamble, not BL/CE\n");
+      LOG_D(MAC,"Frame %d, Subframe %d Calling initiate_ra_proc (CE_level %d)\n",UL_info->frame,UL_info->subframe,
+	    UL_info->rach_ind_br.preamble_list[i].preamble_rel13.rach_resource_type-1);
+      initiate_ra_proc(UL_info->module_id,
+		       UL_info->CC_id,
+		       UL_info->frame,
+		       UL_info->subframe,
+		       UL_info->rach_ind_br.preamble_list[i].preamble_rel8.preamble,
+		       UL_info->rach_ind_br.preamble_list[i].preamble_rel8.timing_advance,
+		       UL_info->rach_ind_br.preamble_list[i].preamble_rel8.rnti,
+		       UL_info->rach_ind_br.preamble_list[i].preamble_rel13.rach_resource_type);
+    }
+    UL_info->rach_ind.number_of_preambles=0;
+  }
+#endif
 }
 
 void handle_ulsch(UL_IND_t *UL_info) {
@@ -33,7 +60,7 @@ void handle_ulsch(UL_IND_t *UL_info) {
 
   for (i=0;i<UL_info->rx_ind.number_of_pdus;i++) {
 
-    LOG_I(MAC,"Frame %d, Subframe %d Calling rx_sdu \n",UL_info->frame,UL_info->subframe);
+    LOG_D(MAC,"Frame %d, Subframe %d Calling rx_sdu \n",UL_info->frame,UL_info->subframe);
     rx_sdu(UL_info->module_id,
 	   UL_info->CC_id,
 	   UL_info->frame,
@@ -50,7 +77,7 @@ void handle_ulsch(UL_IND_t *UL_info) {
   for (i=0;i<UL_info->crc_ind.number_of_crcs;i++) {
 
     if (UL_info->crc_ind.crc_pdu_list[i].crc_indication_rel8.crc_flag == 1) { // CRC error indication
-      LOG_I(MAC,"Frame %d, Subframe %d Calling rx_sdu (CRC error) \n",UL_info->frame,UL_info->subframe);
+      LOG_D(MAC,"Frame %d, Subframe %d Calling rx_sdu (CRC error) \n",UL_info->frame,UL_info->subframe);
       rx_sdu(UL_info->module_id,
 	     UL_info->CC_id,
 	     UL_info->frame,
@@ -79,7 +106,7 @@ void UL_indication(UL_IND_t *UL_info)
   IF_Module_t  *ifi        = if_inst[module_id];
   eNB_MAC_INST *mac        = RC.mac[module_id];
 
-  LOG_I(PHY,"UL_Indication: frame %d, subframe %d, module_id %d, CC_id %d\n",
+  LOG_D(PHY,"UL_Indication: frame %d, subframe %d, module_id %d, CC_id %d\n",
 	UL_info->frame,UL_info->subframe,
 	module_id,CC_id);
 
@@ -124,7 +151,7 @@ void UL_indication(UL_IND_t *UL_info)
 		module_id,
 		CC_id);
     ifi->schedule_response(sched_info);
-    LOG_I(PHY,"Schedule_response: frame %d, subframe %d (dl_pdus %d / %p)\n",sched_info->frame,sched_info->subframe,sched_info->DL_req->dl_config_request_body.number_pdu,
+    LOG_D(PHY,"Schedule_response: frame %d, subframe %d (dl_pdus %d / %p)\n",sched_info->frame,sched_info->subframe,sched_info->DL_req->dl_config_request_body.number_pdu,
 	  &sched_info->DL_req->dl_config_request_body.number_pdu);
   }						 
 }
diff --git a/openair2/PHY_INTERFACE/IF_Module.h b/openair2/PHY_INTERFACE/IF_Module.h
index 9a6915b756..80844b10c8 100644
--- a/openair2/PHY_INTERFACE/IF_Module.h
+++ b/openair2/PHY_INTERFACE/IF_Module.h
@@ -89,6 +89,11 @@ typedef struct{
   /// RACH indication list
   nfapi_rach_indication_body_t rach_ind;
 
+#ifdef Rel14
+  /// RACH indication list for BR UEs
+  nfapi_rach_indication_body_t rach_ind_br;
+#endif
+
   /// SRS indication list
   nfapi_srs_indication_body_t srs_ind;
 
diff --git a/openair2/RRC/LITE/L2_interface.c b/openair2/RRC/LITE/L2_interface.c
index 7b58d9aa13..1f47b77b39 100644
--- a/openair2/RRC/LITE/L2_interface.c
+++ b/openair2/RRC/LITE/L2_interface.c
@@ -197,7 +197,7 @@ mac_rrc_data_req(
 					 (void*)mib,
 					 carrier->MIB,
 					 24);
-	LOG_I(RRC,"Encoded MIB for frame %d (%p), bits %lu\n",sfn,carrier->MIB,enc_rval.encoded);
+	LOG_D(RRC,"Encoded MIB for frame %d (%p), bits %lu\n",sfn,carrier->MIB,enc_rval.encoded);
 	buffer_pP[0]=carrier->MIB[0];
 	buffer_pP[1]=carrier->MIB[1];
 	buffer_pP[2]=carrier->MIB[2];
diff --git a/targets/RT/USER/eNB_usrp.gtkw b/targets/RT/USER/eNB_usrp.gtkw
index 47f505031e..838ec54383 100644
--- a/targets/RT/USER/eNB_usrp.gtkw
+++ b/targets/RT/USER/eNB_usrp.gtkw
@@ -1,15 +1,15 @@
 [*]
 [*] GTKWave Analyzer v3.3.58 (w)1999-2014 BSI
-[*] Wed Aug 31 12:37:04 2016
+[*] Tue Jul 25 20:26:12 2017
 [*]
 [dumpfile] "/tmp/openair_dump_eNB.vcd"
-[dumpfile_mtime] "Wed Aug 31 11:48:14 2016"
-[dumpfile_size] 411905827
+[dumpfile_mtime] "Tue Jul 25 20:11:55 2017"
+[dumpfile_size] 19201475
 [savefile] "/home/papillon/openairinterface5g/targets/RT/USER/eNB_usrp.gtkw"
-[timestart] 10621768000
+[timestart] 29023604000
 [size] 1236 578
 [pos] 309 0
-*-19.793451 29026062100 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+*-20.793451 29026062100 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
 [sst_width] 386
 [signals_width] 262
 [sst_expanded] 1
@@ -23,28 +23,16 @@ variables.trx_tst[63:0]
 @28
 functions.eNB_thread_rxtx0
 @24
-variables.frame_number_RX0_eNB[63:0]
-variables.subframe_number_RX0_eNB[63:0]
-variables.frame_number_TX0_eNB[63:0]
-variables.subframe_number_TX0_eNB[63:0]
+variables.frame_number_RX0_RU[63:0]
+variables.subframe_number_RX0_RU[63:0]
+@25
+variables.frame_number_TX0_RU[63:0]
+@24
+variables.subframe_number_TX0_RU[63:0]
 @28
-functions.phy_procedures_eNb_rx_common0
-functions.phy_procedures_eNb_rx_uespec0
 functions.phy_procedures_eNb_tx0
 functions.eNB_thread_rxtx1
-@24
-variables.frame_number_RX1_eNB[63:0]
-variables.subframe_number_RX1_eNB[63:0]
-variables.frame_number_TX1_eNB[63:0]
-variables.subframe_number_TX1_eNB[63:0]
-@28
-functions.phy_procedures_eNb_rx_common1
-functions.phy_procedures_eNb_rx_uespec1
-@29
-functions.phy_procedures_eNb_tx1
-@28
 functions.phy_enb_sfgen
-functions.phy_eNB_slot_fep
 functions.phy_enb_prach_rx
 @24
 variables.dci_info[63:0]
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index 4c3ffd5aeb..a95342e8b6 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -144,6 +144,9 @@ void init_eNB(int,int);
 void stop_eNB(int nb_inst);
 
 void wakeup_prach_eNB(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe);
+#ifdef Rel14
+void wakeup_prach_eNB_br(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe);
+#endif
 
 static inline int rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_name) {
 
@@ -153,8 +156,12 @@ static inline int rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_nam
   // Common RX procedures subframe n
 
   // if this is IF5 or 3GPP_eNB
-  if (eNB->RU_list[0]->function < NGFI_RAU_IF4p5) wakeup_prach_eNB(eNB,NULL,proc->frame_rx,proc->subframe_rx);
-
+  if (eNB->RU_list[0]->function < NGFI_RAU_IF4p5) {
+    wakeup_prach_eNB(eNB,NULL,proc->frame_rx,proc->subframe_rx);
+#ifdef Rel14
+    wakeup_prach_eNB_br(eNB,NULL,proc->frame_rx,proc->subframe_rx);
+#endif
+  }
   // UE-specific RX processing for subframe n
   phy_procedures_eNB_uespec_RX(eNB, proc, no_relay );
 
@@ -402,7 +409,7 @@ void wakeup_prach_eNB(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe) {
     
   // check if we have to detect PRACH first
   if (is_prach_subframe(fp,frame,subframe)>0) { 
-    LOG_I(PHY,"Triggering prach processing, frame %d, subframe %d\n",frame,subframe);
+    LOG_D(PHY,"Triggering prach processing, frame %d, subframe %d\n",frame,subframe);
     if (proc->instance_cnt_prach == 0) {
       LOG_W(PHY,"[eNB] Frame %d Subframe %d, dropping PRACH\n", frame,subframe);
       return;
@@ -432,6 +439,67 @@ void wakeup_prach_eNB(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe) {
 
 }
 
+#ifdef Rel14
+void wakeup_prach_eNB_br(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe) {
+
+  eNB_proc_t *proc = &eNB->proc;
+  LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
+  int i;
+
+  if (ru!=NULL) {
+    pthread_mutex_lock(&proc->mutex_RU_PRACH_br);
+    for (i=0;i<eNB->num_RU;i++) {
+      if (ru == eNB->RU_list[i]) {
+	LOG_I(PHY,"frame %d, subframe %d: RU %d for eNB %d signals PRACH BR (mask %x, num_RU %d)\n",frame,subframe,i,eNB->Mod_id,proc->RU_mask_prach_br,eNB->num_RU);
+	if ((proc->RU_mask_prach_br&(1<<i)) > 0)
+	  LOG_E(PHY,"eNB %d frame %d, subframe %d : previous information (PRACH BR) from RU %d (num_RU %d, mask %x) has not been served yet!\n",
+		eNB->Mod_id,frame,subframe,ru->idx,eNB->num_RU,proc->RU_mask_prach_br);
+	proc->RU_mask_prach_br |= (1<<i);
+      }
+    }
+    if (proc->RU_mask_prach_br != (1<<eNB->num_RU)-1) {  // not all RUs have provided their information so return
+      pthread_mutex_unlock(&proc->mutex_RU_PRACH_br);
+      return(0);
+    }
+    else { // all RUs have provided their information so continue on and wakeup eNB processing
+      proc->RU_mask_prach_br = 0;
+      pthread_mutex_unlock(&proc->mutex_RU_PRACH_br);
+    }
+  }
+    
+  // check if we have to detect PRACH first
+  if (is_prach_subframe(fp,frame,subframe)>0) { 
+    LOG_D(PHY,"Triggering prach br processing, frame %d, subframe %d\n",frame,subframe);
+    if (proc->instance_cnt_prach_br == 0) {
+      LOG_W(PHY,"[eNB] Frame %d Subframe %d, dropping PRACH BR\n", frame,subframe);
+      return;
+    }
+    
+    // wake up thread for PRACH RX
+    if (pthread_mutex_lock(&proc->mutex_prach_br) != 0) {
+      LOG_E( PHY, "[eNB] ERROR pthread_mutex_lock for eNB PRACH thread %d (IC %d)\n", proc->thread_index, proc->instance_cnt_prach_br);
+      exit_fun( "error locking mutex_prach" );
+      return;
+    }
+    
+    ++proc->instance_cnt_prach_br;
+    // set timing for prach thread
+    proc->frame_prach_br = frame;
+    proc->subframe_prach_br = subframe;
+    
+    // the thread can now be woken up
+    if (pthread_cond_signal(&proc->cond_prach_br) != 0) {
+      LOG_E( PHY, "[eNB] ERROR pthread_cond_signal for eNB PRACH BR thread %d\n", proc->thread_index);
+      exit_fun( "ERROR pthread_cond_signal" );
+      return;
+    }
+    
+    pthread_mutex_unlock( &proc->mutex_prach_br );
+  }
+
+}
+#endif
+
 /*!
  * \brief The prach receive thread of eNB.
  * \param param is a \ref eNB_proc_t structure which contains the info what to process.
@@ -457,7 +525,11 @@ static void* eNB_thread_prach( void* param ) {
     if (wait_on_condition(&proc->mutex_prach,&proc->cond_prach,&proc->instance_cnt_prach,"eNB_prach_thread") < 0) break;
 
     LOG_D(PHY,"Running eNB prach procedures\n");
-    prach_procedures(eNB);
+    prach_procedures(eNB
+#ifdef Rel14
+		     ,0
+#endif
+		     );
     
     if (release_thread(&proc->mutex_prach,&proc->instance_cnt_prach,"eNB_prach_thread") < 0) break;
   }
@@ -468,6 +540,44 @@ static void* eNB_thread_prach( void* param ) {
   return &eNB_thread_prach_status;
 }
 
+#ifdef Rel14
+/*!
+ * \brief The prach receive thread of eNB for BL/CE UEs.
+ * \param param is a \ref eNB_proc_t structure which contains the info what to process.
+ * \returns a pointer to an int. The storage is not on the heap and must not be freed.
+ */
+static void* eNB_thread_prach_br( void* param ) {
+  static int eNB_thread_prach_status;
+
+
+  PHY_VARS_eNB *eNB= (PHY_VARS_eNB *)param;
+  eNB_proc_t *proc = &eNB->proc;
+
+  // set default return value
+  eNB_thread_prach_status = 0;
+
+  thread_top_init("eNB_thread_prach_br",1,500000L,1000000L,20000000L);
+
+  while (!oai_exit) {
+    
+    if (oai_exit) break;
+    
+
+    if (wait_on_condition(&proc->mutex_prach_br,&proc->cond_prach_br,&proc->instance_cnt_prach_br,"eNB_prach_thread_br") < 0) break;
+
+    LOG_D(PHY,"Running eNB prach procedures for BL/CE UEs\n");
+    prach_procedures(eNB,1);
+    
+    if (release_thread(&proc->mutex_prach_br,&proc->instance_cnt_prach_br,"eNB_prach_thread_br") < 0) break;
+  }
+
+  LOG_I(PHY, "Exiting eNB thread PRACH BR\n");
+
+  eNB_thread_prach_status = 0;
+  return &eNB_thread_prach_status;
+}
+
+#endif
 
 
 extern void init_fep_thread(PHY_VARS_eNB *, pthread_attr_t *);
@@ -482,6 +592,9 @@ void init_eNB_proc(int inst) {
   eNB_proc_t *proc;
   eNB_rxtx_proc_t *proc_rxtx;
   pthread_attr_t *attr0=NULL,*attr1=NULL,*attr_FH=NULL,*attr_prach=NULL,*attr_asynch=NULL,*attr_single=NULL,*attr_fep=NULL,*attr_td=NULL,*attr_te=NULL,*attr_synch=NULL;
+#ifdef Rel14
+  pthread_attr_t *attr_prach_br=NULL;
+#endif
 
   for (CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) {
     eNB = RC.eNB[inst][CC_id];
@@ -523,10 +636,22 @@ void init_eNB_proc(int inst) {
     pthread_attr_init( &proc->attr_te);
     pthread_attr_init( &proc_rxtx[0].attr_rxtx);
     pthread_attr_init( &proc_rxtx[1].attr_rxtx);
+#ifdef Rel14
+    proc->instance_cnt_prach_br    = -1;
+    proc->RU_mask_prach_br=0;
+    pthread_mutex_init( &proc->mutex_prach_br, NULL);
+    pthread_mutex_init( &proc->mutex_RU_PRACH_br,NULL);
+    pthread_cond_init( &proc->cond_prach_br, NULL);
+    pthread_attr_init( &proc->attr_prach_br);
+#endif
 #ifndef DEADLINE_SCHEDULER
     attr0       = &proc_rxtx[0].attr_rxtx;
     attr1       = &proc_rxtx[1].attr_rxtx;
     attr_prach  = &proc->attr_prach;
+#ifdef Rel14
+    attr_prach_br  = &proc->attr_prach_br;
+#endif
+
     attr_asynch = &proc->attr_asynch_rxtx;
     attr_single = &proc->attr_single;
     attr_td     = &proc->attr_td;
@@ -538,7 +663,9 @@ void init_eNB_proc(int inst) {
       pthread_create( &proc_rxtx[1].pthread_rxtx, attr1, eNB_thread_rxtx, &proc_rxtx[1] );
     }
     pthread_create( &proc->pthread_prach, attr_prach, eNB_thread_prach, eNB );
-
+#ifdef Rel14
+    pthread_create( &proc->pthread_prach_br, attr_prach_br, eNB_thread_prach_br, eNB );
+#endif
     char name[16];
     if (eNB->single_thread_flag==0) {
       snprintf( name, sizeof(name), "RXTX0 %d", i );
@@ -601,10 +728,18 @@ void kill_eNB_proc(int inst) {
     pthread_cond_signal( &proc_rxtx[0].cond_rxtx );    
     pthread_cond_signal( &proc_rxtx[1].cond_rxtx );
     pthread_cond_signal( &proc->cond_prach );
+
     pthread_cond_broadcast(&sync_phy_proc.cond_phy_proc_tx);
     pthread_join( proc->pthread_prach, (void**)&status );    
+
     pthread_mutex_destroy( &proc->mutex_prach );
-    pthread_cond_destroy( &proc->cond_prach );         
+    pthread_cond_destroy( &proc->cond_prach );
+#ifdef Rel14
+    pthread_cond_signal( &proc->cond_prach_br );
+    pthread_join( proc->pthread_prach_br, (void**)&status );    
+    pthread_mutex_destroy( &proc->mutex_prach_br );
+    pthread_cond_destroy( &proc->cond_prach_br );
+#endif         
     pthread_mutex_destroy(&eNB->UL_INFO_mutex);
     int i;
     for (i=0;i<2;i++) {
@@ -721,6 +856,15 @@ void init_eNB_afterRU() {
       eNB->frame_parms.nb_antennas_rx       = 0;
       for (ru_id=0,aa=0;ru_id<eNB->num_RU;ru_id++) {
 	eNB->frame_parms.nb_antennas_rx    += eNB->RU_list[ru_id]->nb_rx;
+
+	AssertFatal(eNB->RU_list[ru_id]->common.rxdataF!=NULL,
+		    "RU %d : common.rxdataF is NULL\n",
+		    eNB->RU_list[ru_id]->idx);
+
+	AssertFatal(eNB->RU_list[ru_id]->prach_rxsigF!=NULL,
+		    "RU %d : prach_rxsigF is NULL\n",
+		    eNB->RU_list[ru_id]->idx);
+
 	for (i=0;i<eNB->RU_list[ru_id]->nb_rx;aa++,i++) { 
 	  LOG_I(PHY,"Attaching RU %d antenna %d to eNB antenna %d\n",eNB->RU_list[ru_id]->idx,i,aa);
 	  eNB->prach_vars.rxsigF[aa]       =  eNB->RU_list[ru_id]->prach_rxsigF[i];
@@ -747,11 +891,13 @@ void init_eNB_afterRU() {
 
     AssertFatal(RC.ru[ru_id]!=NULL,"ru_id %d is null\n",ru_id);
     
-    RC.ru[ru_id]->wakeup_rxtx      = wakeup_rxtx;
-    RC.ru[ru_id]->wakeup_prach_eNB = wakeup_prach_eNB;
-    RC.ru[ru_id]->eNB_top          = eNB_top;
+    RC.ru[ru_id]->wakeup_rxtx         = wakeup_rxtx;
+    RC.ru[ru_id]->wakeup_prach_eNB    = wakeup_prach_eNB;
+    RC.ru[ru_id]->wakeup_prach_eNB_br = wakeup_prach_eNB_br;
+    RC.ru[ru_id]->eNB_top             = eNB_top;
   }
 }
+
 void init_eNB(int single_thread_flag,int wait_for_sync) {
   
   int CC_id;
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index a960ce376e..2d72b1d745 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -479,15 +479,19 @@ void fh_if4p5_south_asynch_in(RU_t *ru,int *frame,int *subframe) {
 
   uint16_t packet_type;
   uint32_t symbol_number,symbol_mask,symbol_mask_full,prach_rx;
-
+  uint32_t got_prach_info=0;
 
   symbol_number = 0;
-  symbol_mask = 0;
-  symbol_mask_full = (1<<fp->symbols_per_tti)-1;
-  prach_rx = 0;
+  symbol_mask   = (1<<fp->symbols_per_tti)-1;
+  prach_rx      = 0;
 
   do {   // Blocking, we need a timeout on this !!!!!!!!!!!!!!!!!!!!!!!
     recv_IF4p5(ru, &proc->frame_rx, &proc->subframe_rx, &packet_type, &symbol_number);
+    // grab first prach information for this new subframe
+    if (got_prach_info==0) {
+      prach_rx       = is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx);
+      got_prach_info = 1;
+    }
     if (proc->first_rx != 0) {
       *frame = proc->frame_rx;
       *subframe = proc->subframe_rx;
@@ -503,13 +507,15 @@ void fh_if4p5_south_asynch_in(RU_t *ru,int *frame,int *subframe) {
 	exit_fun("Exiting");
       }
     }
-    if (packet_type == IF4p5_PULFFT) {
-      symbol_mask = symbol_mask | (1<<symbol_number);
-      prach_rx = (is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx)>0) ? 1 : 0;                            
-    } else if (packet_type == IF4p5_PRACH) {
-      prach_rx = 0;
-    }
-  } while( (symbol_mask != symbol_mask_full) || (prach_rx == 1));    
+    if      (packet_type == IF4p5_PULFFT)       symbol_mask &= (~(1<<symbol_number));
+    else if (packet_type == IF4p5_PRACH)        prach_rx    &= (~0x1);
+#ifdef Rel14
+    else if (packet_type == IF4p5_PRACH_BR_CE0) prach_rx    &= (~0x2);
+    else if (packet_type == IF4p5_PRACH_BR_CE1) prach_rx    &= (~0x4);
+    else if (packet_type == IF4p5_PRACH_BR_CE2) prach_rx    &= (~0x8);
+    else if (packet_type == IF4p5_PRACH_BR_CE3) prach_rx    &= (~0x10);
+#endif
+  } while( (symbol_mask > 0) || (prach_rx >0));   // haven't received all PUSCH symbols and PRACH information 
 } 
 
 
@@ -706,6 +712,8 @@ void rx_rf(RU_t *ru,int *frame,int *subframe) {
   if (ru == RC.ru[0]) {
     VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_RU, proc->frame_rx );
     VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX0_RU, proc->subframe_rx );
+    VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_RU, proc->frame_tx );
+    VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_RU, proc->subframe_tx );
   }
   
   if (proc->first_rx == 0) {
@@ -893,20 +901,60 @@ static void* ru_thread_prach( void* param ) {
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 1 );      
     rx_prach(NULL,
 	     ru,
+	     NULL,
              NULL,
              NULL,
              proc->frame_prach,
-             0);
+             0
+#ifdef Rel14
+	     ,0
+#endif
+	     );
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 0 );      
     if (release_thread(&proc->mutex_prach,&proc->instance_cnt_prach,"ru_prach_thread") < 0) break;
   }
 
-  printf( "Exiting RU thread PRACH\n");
+  LOG_I(PHY, "Exiting RU thread PRACH\n");
 
   ru_thread_prach_status = 0;
   return &ru_thread_prach_status;
 }
 
+#ifdef Rel14
+static void* ru_thread_prach_br( void* param ) {
+
+  static int ru_thread_prach_status;
+
+  RU_t *ru        = (RU_t*)param;
+  RU_proc_t *proc = (RU_proc_t*)&ru->proc;
+
+  // set default return value
+  ru_thread_prach_status = 0;
+
+  thread_top_init("ru_thread_prach_br",1,500000L,1000000L,20000000L);
+
+  while (!oai_exit) {
+    
+    if (oai_exit) break;
+    if (wait_on_condition(&proc->mutex_prach_br,&proc->cond_prach_br,&proc->instance_cnt_prach_br,"ru_prach_thread_br") < 0) break;
+    rx_prach(NULL,
+	     ru,
+	     NULL,
+             NULL,
+             NULL,
+             proc->frame_prach_br,
+             0,
+	     1);
+    if (release_thread(&proc->mutex_prach_br,&proc->instance_cnt_prach_br,"ru_prach_thread_br") < 0) break;
+  }
+
+  LOG_I(PHY, "Exiting RU thread PRACH BR\n");
+
+  ru_thread_prach_status = 0;
+  return &ru_thread_prach_status;
+}
+#endif
+
 int wakeup_synch(RU_t *ru){
 
   struct timespec wait;
@@ -1056,6 +1104,35 @@ static inline int wakeup_prach_ru(RU_t *ru) {
   return(0);
 }
 
+#ifdef Rel14
+static inline int wakeup_prach_ru_br(RU_t *ru) {
+
+  struct timespec wait;
+  
+  wait.tv_sec=0;
+  wait.tv_nsec=5000000L;
+
+  if (pthread_mutex_timedlock(&ru->proc.mutex_prach_br,&wait) !=0) {
+    LOG_E( PHY, "[RU] ERROR pthread_mutex_lock for RU prach thread BR (IC %d)\n", ru->proc.instance_cnt_prach_br);
+    exit_fun( "error locking mutex_rxtx" );
+    return(-1);
+  }
+  if (ru->proc.instance_cnt_prach_br==-1) {
+    ++ru->proc.instance_cnt_prach_br;
+    ru->proc.frame_prach_br    = ru->proc.frame_rx;
+    ru->proc.subframe_prach_br = ru->proc.subframe_rx;
+
+    LOG_D(PHY,"RU %d: waking up PRACH thread\n",ru->idx);
+    // the thread can now be woken up
+    AssertFatal(pthread_cond_signal(&ru->proc.cond_prach_br) == 0, "ERROR pthread_cond_signal for RU prach thread BR\n");
+  }
+  else LOG_W(PHY,"RU prach thread busy, skipping\n");
+  pthread_mutex_unlock( &ru->proc.mutex_prach_br );
+
+  return(0);
+}
+#endif
+
 static void* ru_thread( void* param ) {
 
   static int ru_thread_status;
@@ -1084,15 +1161,17 @@ static void* ru_thread( void* param ) {
     if (ru->if_south == LOCAL_RF) ret = connect_rau(ru);
     else ret = attach_rru(ru);
     AssertFatal(ret==0,"Cannot connect to radio\n");
-    LOG_I(PHY, "Signaling main thread that RU %d is ready\n",ru->idx);
-    pthread_mutex_lock(&RC.ru_mutex);
-    RC.ru_mask &= ~(1<<ru->idx);
-    pthread_cond_signal(&RC.ru_cond);
-    pthread_mutex_unlock(&RC.ru_mutex);
   }
 
+  LOG_I(PHY, "Signaling main thread that RU %d is ready\n",ru->idx);
+  pthread_mutex_lock(&RC.ru_mutex);
+  RC.ru_mask &= ~(1<<ru->idx);
+  pthread_cond_signal(&RC.ru_cond);
+  pthread_mutex_unlock(&RC.ru_mutex);
   
   wait_sync("ru_thread");
+  
+
 
 
   // Start RF device if any
@@ -1146,18 +1225,19 @@ static void* ru_thread( void* param ) {
 	  is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx),
 	  proc->frame_rx,proc->subframe_rx);
  
-    if ((ru->do_prach>0) && (is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx)>0))
-      wakeup_prach_ru(ru);
-
-
+    if ((ru->do_prach>0) && (is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx)==1)) wakeup_prach_ru(ru);
+#ifdef Rel14
+    else if ((ru->do_prach>0) && (is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx)>1)) wakeup_prach_ru_br(ru);
+#endif
 
     // adjust for timing offset between RU
     if (ru->idx!=0) proc->frame_tx = (proc->frame_tx+proc->frame_offset)&1023;
 
 
     // do RX front-end processing (frequency-shift, dft) if needed
+    if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 ); 
     if (ru->feprx) ru->feprx(ru);
-
+    if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 0 ); 
 
     T(T_ENB_MASTER_TICK, T_INT(0), T_INT(proc->frame_rx), T_INT(proc->subframe_rx));
 
@@ -1293,7 +1373,9 @@ void init_RU_proc(RU_t *ru) {
   RU_proc_t *proc;
   pthread_attr_t *attr_FH=NULL,*attr_prach=NULL,*attr_asynch=NULL,*attr_synch=NULL;
   //pthread_attr_t *attr_fep=NULL;
-
+#ifdef Rel14
+  pthread_attr_t *attr_prach_br=NULL;
+#endif
   char name[100];
 
 #ifndef OCP_FRAMEWORK
@@ -1330,32 +1412,37 @@ void init_RU_proc(RU_t *ru) {
   pthread_attr_init( &proc->attr_synch);
   pthread_attr_init( &proc->attr_asynch_rxtx);
   pthread_attr_init( &proc->attr_fep);
-  
+
+#ifdef Rel14
+  proc->instance_cnt_prach_br       = -1;
+  pthread_mutex_init( &proc->mutex_prach_br, NULL);
+  pthread_cond_init( &proc->cond_prach_br, NULL);
+  pthread_attr_init( &proc->attr_prach_br);
+#endif  
   
 #ifndef DEADLINE_SCHEDULER
-  attr_FH     = &proc->attr_FH;
-  attr_prach  = &proc->attr_prach;
-  attr_synch  = &proc->attr_synch;
-  attr_asynch = &proc->attr_asynch_rxtx;
-  //  attr_fep    = &proc->attr_fep;
+  attr_FH        = &proc->attr_FH;
+  attr_prach     = &proc->attr_prach;
+  attr_synch     = &proc->attr_synch;
+  attr_asynch    = &proc->attr_asynch_rxtx;
+#ifdef Rel14
+  attr_prach_br  = &proc->attr_prach_br;
+#endif
 #endif
   
   pthread_create( &proc->pthread_FH, attr_FH, ru_thread, (void*)ru );
 
   if (ru->function == NGFI_RRU_IF4p5) {
     pthread_create( &proc->pthread_prach, attr_prach, ru_thread_prach, (void*)ru );
-  
+#ifdef Rel14  
+    pthread_create( &proc->pthread_prach_br, attr_prach_br, ru_thread_prach_br, (void*)ru );
+#endif
     if (ru->is_slave == 1) pthread_create( &proc->pthread_synch, attr_synch, ru_thread_synch, (void*)ru);
     
     
     if ((ru->if_timing == synch_to_other) ||
 	(ru->function == NGFI_RRU_IF5) ||
-	(ru->function == NGFI_RRU_IF4p5))
-      
-      
-      pthread_create( &proc->pthread_asynch_rxtx, attr_asynch, ru_thread_asynch_rxtx, (void*)ru );
-    
-    
+	(ru->function == NGFI_RRU_IF4p5)) pthread_create( &proc->pthread_asynch_rxtx, attr_asynch, ru_thread_asynch_rxtx, (void*)ru );
     
     snprintf( name, sizeof(name), "ru_thread_FH %d", ru->idx );
     pthread_setname_np( proc->pthread_FH, name );
@@ -1474,6 +1561,7 @@ void fill_rf_config(RU_t *ru,const char *rf_config_file) {
     cfg->tx_bw = 1.5e6;
     cfg->rx_bw = 1.5e6;
   }
+  else AssertFatal(1==0,"Unknown N_RB_DL %d\n",fp->N_RB_DL);
 
   if (fp->frame_type==TDD)
     cfg->duplex_mode = duplex_mode_TDD;
@@ -1494,7 +1582,7 @@ void fill_rf_config(RU_t *ru,const char *rf_config_file) {
     cfg->rx_gain[i] = (double)fp->att_rx;
 
     cfg->configFilename = rf_config_file;
-    printf("channel %d, Setting tx_gain %f, rx_gain %f, tx_freq %f, rx_freq %f\n",
+    printf("channel %d, Setting tx_gain offset %f, rx_gain offset %f, tx_freq %f, rx_freq %f\n",
 	   i, cfg->tx_gain[i],
 	   cfg->rx_gain[i],
 	   cfg->tx_freq[i],
@@ -1557,6 +1645,7 @@ void configure_ru(int idx,
   RRU_config_t       *config       = (RRU_config_t *)arg;
   RRU_capabilities_t *capabilities = (RRU_capabilities_t*)arg;
   int ret;
+  int i;
 
   LOG_I(PHY, "Received capabilities from RRU %d\n",idx);
 
@@ -1582,6 +1671,13 @@ void configure_ru(int idx,
       LOG_I(PHY,"REMOTE_IF4p5: prach_FrequOffset %d, prach_ConfigIndex %d\n",
 	    config->prach_FreqOffset[0],config->prach_ConfigIndex[0]);
 
+#ifdef Rel14
+      for (i=0;i<4;i++) {
+	config->emtc_prach_CElevel_enable[0][i]  = ru->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i];
+	config->emtc_prach_FreqOffset[0][i]      = ru->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[i];
+	config->emtc_prach_ConfigIndex[0][i]     = ru->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[i];
+      }
+#endif
     }
     // take antenna capabilities of RRU
     ru->nb_tx                      = capabilities->nb_tx[0];
@@ -1615,6 +1711,13 @@ void configure_rru(int idx,
 	  config->prach_FreqOffset[0],config->prach_ConfigIndex[0]);
     ru->frame_parms.prach_config_common.prach_ConfigInfo.prach_FreqOffset  = config->prach_FreqOffset[0]; 
     ru->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex = config->prach_ConfigIndex[0]; 
+#ifdef Rel14
+    for (int i=0;i<4;i++) {
+      ru->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i] = config->emtc_prach_CElevel_enable[0][i];
+      ru->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[i]     = config->emtc_prach_FreqOffset[0][i];
+      ru->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_ConfigIndex[i]    = config->emtc_prach_ConfigIndex[0][i];
+    }
+#endif
   }
   
   init_frame_parms(&ru->frame_parms,1);
@@ -1671,7 +1774,7 @@ void init_RU(const char *rf_config_file) {
   // read in configuration file)
   printf("configuring RU from file\n");
   RCconfig_RU();
-  printf("number of L1 instaces %d, number of RU %d\n",RC.nb_L1_inst,RC.nb_RU);
+  printf("number of L1 instances %d, number of RU %d\n",RC.nb_L1_inst,RC.nb_RU);
 
   for (i=0;i<RC.nb_L1_inst;i++) 
     for (CC_id=0;CC_id<RC.nb_CC[i];CC_id++) RC.eNB[i][CC_id]->num_RU=0;
@@ -1685,9 +1788,13 @@ void init_RU(const char *rf_config_file) {
 
     
     eNB0             = ru->eNB_list[0];
+    if ((ru->function != NGFI_RRU_IF5) || (ru->function != NGFI_RRU_IF4p5))
+      AssertFatal(eNB0!=NULL,"eNB0 is null!\n");
 
-    if (eNB0) memcpy((void*)&ru->frame_parms,(void*)&eNB0->frame_parms,sizeof(LTE_DL_FRAME_PARMS));
-
+    if (eNB0) {
+      LOG_I(PHY,"Copying frame parms from eNB %d to ru %d\n",eNB0->Mod_id,ru->idx);
+      memcpy((void*)&ru->frame_parms,(void*)&eNB0->frame_parms,sizeof(LTE_DL_FRAME_PARMS));
+    }
     // attach all RU to all eNBs in its list/
     for (i=0;i<ru->num_eNB;i++) {
       eNB0 = ru->eNB_list[i];
@@ -1700,7 +1807,7 @@ void init_RU(const char *rf_config_file) {
     case LOCAL_RF:   // this is an RU with integrated RF (RRU, eNB)
       if (ru->function ==  NGFI_RRU_IF5) {                 // IF5 RRU
 	ru->do_prach              = 0;                      // no prach processing in RU
-	ru->fh_north_in           = NULL;                   // no synchronous incoming fronthaul from north
+	ru->fh_north_in           = NULL;                   // no shynchronous incoming fronthaul from north
 	ru->fh_north_out          = fh_if5_north_out;       // need only to do send_IF5  reception
 	ru->fh_south_out          = tx_rf;                  // send output to RF
 	ru->fh_north_asynch_in    = fh_if5_north_asynch_in; // TX packets come asynchronously 
@@ -1754,10 +1861,11 @@ void init_RU(const char *rf_config_file) {
       ru->fh_south_in            = rx_rf;                               // local synchronous RF RX
       ru->fh_south_out           = tx_rf;                               // local synchronous RF TX
       ru->start_rf               = start_rf;                            // need to start the local RF interface
-      printf("configuring RRU for ru_id %d (start_rf %p)\n",ru_id,start_rf);
-      ru->ifdevice.configure_rru = configure_rru;
-      fill_rf_config(ru,rf_config_file);
-      
+      printf("configuring ru_id %d (start_rf %p)\n",ru_id,start_rf);
+
+      fill_rf_config(ru,rf_config_file);      
+      init_frame_parms(&ru->frame_parms,1);
+      phy_init_RU(ru);
 
       ret = openair0_device_load(&ru->rfdevice,&ru->openair0_cfg);
       if (setup_RU_buffers(ru)!=0) {