diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.c b/openair1/PHY/NR_TRANSPORT/nr_dci.c
index 2d79aa8fbd..0687acd1b4 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c
@@ -168,6 +168,13 @@ uint8_t nr_generate_dci_top(PHY_VARS_gNB *gNB,
     /// Scrambling
     uint32_t scrambled_output[NR_MAX_DCI_SIZE_DWORD]= {0};
     nr_pdcch_scrambling(encoder_output, encoded_length, Nid, scrambling_RNTI, scrambled_output);
+
+    printf("polar_encoder_fast: pdcch_pdu_rel15->dci_pdu.PayloadSizeBits[d] = %i, pdcch_pdu_rel15->dci_pdu.AggregationLevel[d] = %i, n_RNTI = %i\n",
+           pdcch_pdu_rel15->dci_pdu.PayloadSizeBits[d], pdcch_pdu_rel15->dci_pdu.AggregationLevel[d], n_RNTI);
+
+    printf("nr_pdcch_scrambling: encoded_length = %i, Nid = %i, scrambling_RNTI = %i\n\n",encoded_length, Nid, scrambling_RNTI);
+
+
 #ifdef DEBUG_CHANNEL_CODING
     printf("scrambled output: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\t [4]->0x%08x\t [5]->0x%08x\t \
 [6]->0x%08x \t [7]->0x%08x \t [8]->0x%08x \t [9]->0x%08x\t [10]->0x%08x\t [11]->0x%08x\n",
diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
index 53456bb691..8fb663f294 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -873,12 +873,18 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
         #endif
 
         uint16_t crc = polar_decoder_int16(tmp_e,
-                                          dci_estimation,
+                                           dci_estimation,
                                           1,
                                           currentPtrDCI);
 
         n_rnti = rel15->rnti;
 
+        printf("nr_pdcch_unscrambling: encoded_length = %i, Nid = %i, scrambling_RNTI = %i\n",
+               L*108, rel15->coreset.pdcch_dmrs_scrambling_id, rel15->coreset.scrambling_rnti);
+
+        printf("polar_decoder_int16: pdcch_pdu_rel15->dci_pdu.PayloadSizeBits[d] = %i, pdcch_pdu_rel15->dci_pdu.AggregationLevel[d] = %i, n_RNTI = %i\n",
+               dci_length, L, rel15->rnti);
+
         if (crc == n_rnti) {
           LOG_D(PHY,"Decoded crc %x matches rnti %x for DCI format %d\n", crc, n_rnti, rel15->dci_format_options[k]);
           dci_ind->SFN = frame;
@@ -889,6 +895,10 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
           dci_ind->dci_list[dci_ind->number_of_dcis].payloadSize = dci_length;
           memcpy((void*)dci_ind->dci_list[dci_ind->number_of_dcis].payloadBits,(void*)dci_estimation,8);
           dci_ind->number_of_dcis++;
+
+          printf("\n>> Received dci indication (rnti %x,dci format %d,n_CCE %d,payloadSize %d,payload %llx)\n\n",
+                 n_rnti,rel15->dci_format_options[k],CCEind,dci_length,*(unsigned long long*)dci_estimation);
+
           break;    // If DCI is found, no need to check for remaining DCI lengths
         } else {
           LOG_D(PHY,"Decoded crc %x does not match rnti %x for DCI format %d\n", crc, n_rnti, rel15->dci_format_options[k]);
@@ -896,6 +906,10 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
       }
     }
   }
+
+  printf("nr_dci_decoding_procedure: frame = %i, slot = %i\n", frame, slot);
+  getchar();
+
   return(dci_ind->number_of_dcis);
 }
 
diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c
index bc98e16d39..800214e715 100755
--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
@@ -394,7 +394,7 @@ void config_control_ue(NR_UE_MAC_INST_t *mac){
     NR_SearchSpace_t *css = commonSearchSpaceList->list.array[css_id];
     AssertFatal(css->controlResourceSetId != NULL, "ss->controlResourceSetId is null\n");
     AssertFatal(*css->controlResourceSetId == mac->coreset[bwp_id - 1][coreset_id - 1]->controlResourceSetId, "ss->controlResourceSetId is unknown\n");
-    AssertFatal(css->searchSpaceId != 0, "css->searchSpaceId is 0\n");
+    AssertFatal(&css->searchSpaceId != NULL, "css->searchSpaceId is null\n");
     AssertFatal(css->searchSpaceType != NULL, "css->searchSpaceType is null\n");
     AssertFatal(css->monitoringSymbolsWithinSlot != NULL, "css->monitoringSymbolsWithinSlot is null\n");
     AssertFatal(css->monitoringSymbolsWithinSlot->buf != NULL, "css->monitoringSymbolsWithinSlot->buf is null\n");
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
index 33aed06aec..27680893f0 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
@@ -143,6 +143,23 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
     case NR_RNTI_SP_CSI:
     break;
     case NR_RNTI_SI:
+
+      // we use DL BWP dedicated
+      sps = bwp_Common->genericParameters.cyclicPrefix == NULL ? 14 : 12;
+      // for SPS=14 8 MSBs in positions 13 down to 6
+      monitoringSymbolsWithinSlot = (ss->monitoringSymbolsWithinSlot->buf[0]<<(sps-8)) | (ss->monitoringSymbolsWithinSlot->buf[1]>>(16-sps));
+      rel15->rnti = mac->crnti; // FIXME: Must be 0xFFFF
+      rel15->BWPSize = NRRIV2BW(bwp_Common->genericParameters.locationAndBandwidth, 275);
+      rel15->BWPStart = NRRIV2PRBOFFSET(bwp_Common->genericParameters.locationAndBandwidth, 275);
+      rel15->SubcarrierSpacing = bwp_Common->genericParameters.subcarrierSpacing;
+
+      for (int i = 0; i < rel15->num_dci_options; i++) {
+        rel15->dci_length_options[i] = nr_dci_size(scc, mac->scg, def_dci_pdu_rel15, rel15->dci_format_options[i], NR_RNTI_C, rel15->BWPSize, bwp_id);
+      }
+
+      printf("bwp_Common->genericParameters.locationAndBandwidth = %li\n", bwp_Common->genericParameters.locationAndBandwidth);
+      printf("rel15->BWPSize = %i\n", rel15->BWPSize);
+
     break;
     case NR_RNTI_SFI:
     break;
@@ -203,6 +220,14 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
       // Fetch configuration for searchSpaceZero
       // note: The search space with the SearchSpaceId = 0 identifies the search space configured via PBCH (MIB) and in ServingCellConfigCommon (searchSpaceZero).
       if (pdcch_ConfigCommon->choice.setup->searchSpaceZero){
+
+        printf("pdcch_ConfigCommon->choice.setup->searchSpaceZero = %li\n", *pdcch_ConfigCommon->choice.setup->searchSpaceZero);
+
+        if (pdcch_ConfigCommon->choice.setup->searchSpaceSIB1 == NULL){
+          pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=calloc(1,sizeof(*pdcch_ConfigCommon->choice.setup->searchSpaceSIB1));
+        }
+        *pdcch_ConfigCommon->choice.setup->searchSpaceSIB1 = 0;
+
         LOG_D(MAC, "[DCI_CONFIG] Configure SearchSpace#0 of the initial BWP\n");
         LOG_W(MAC, "[DCI_CONFIG] This should not be available yet...");
       }
@@ -227,7 +252,16 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
           }
         }
         if (pdcch_ConfigCommon->choice.setup->searchSpaceSIB1){
-          if (ss->searchSpaceId == *pdcch_ConfigCommon->choice.setup->searchSpaceSIB1){
+          //if (ss->searchSpaceId == *pdcch_ConfigCommon->choice.setup->searchSpaceSIB1){
+
+            if(slot  == 10){
+              rel15->num_dci_options = 1;
+              rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
+              config_dci_pdu(mac, rel15, dl_config, NR_RNTI_SI, ss_id);
+              fill_dci_search_candidates(ss, rel15);
+            //}
+
+
             // Configure monitoring of PDCCH candidates in Type0-PDCCH common search space on the MCG
             LOG_W(MAC, "[DCI_CONFIG] This seach space should not be configured yet...");
           }
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index cd2189cfe3..7f93bdc262 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -313,7 +313,7 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
   mac->dl_config_request.slot = (ssb_index>>1) + ((ssb_index>>4)<<1); // not valid for 240kHz SCS
 
 
-  printf("extra_bits = %i\n", extra_bits);
+  printf("\nextra_bits = %i\n", extra_bits);
 
   printf("mac->type0_PDCCH_CSS_config.num_rbs = %i\n", mac->type0_PDCCH_CSS_config.num_rbs);
   printf("mac->type0_PDCCH_CSS_config.num_symbols = %i\n", mac->type0_PDCCH_CSS_config.num_symbols);
@@ -333,366 +333,6 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
 
   printf("\n\n\n");
 
-  /*//if(mac->mib != NULL){
-  uint16_t frame = (mac->mib->systemFrameNumber.buf[0] >> mac->mib->systemFrameNumber.bits_unused);
-  uint16_t frame_number_4lsb = 0;
-  for (int i=0; i<4; i++)
-    frame_number_4lsb |= ((extra_bits>>i)&1)<<(3-i);
-  //uint8_t half_frame_bit = ( extra_bits >> 4 ) & 0x1;               //	extra bits[4]
-  uint8_t ssb_subcarrier_offset_msb = ( extra_bits >> 5 ) & 0x1;    //	extra bits[5]
-  uint8_t ssb_subcarrier_offset = (uint8_t)mac->mib->ssb_SubcarrierOffset;
-
-  //uint32_t ssb_index = 0;    //  TODO: ssb_index should obtain from L1 in case Lssb != 64
-
-  frame = frame << 4;
-  frame = frame | frame_number_4lsb;
-
-  if(ssb_length == 64){
-    ssb_index = ssb_index & (( extra_bits >> 2 ) & 0x1C );    //	{ extra_bits[5:7], ssb_index[2:0] }
-  }else{
-    if(ssb_subcarrier_offset_msb){
-      ssb_subcarrier_offset = ssb_subcarrier_offset | 0x10;
-    }
-  }
-
-
-
-  subcarrier_spacing_t scs_ssb = scs_30kHz;      //  default for 
-  //const uint32_t scs_index = 0;
-  const uint32_t num_slot_per_frame = 20;
-  subcarrier_spacing_t scs_pdcch;
-
-  //  assume carrier frequency < 6GHz
-  if(mac->mib->subCarrierSpacingCommon == NR_MIB__subCarrierSpacingCommon_scs15or60){
-    scs_pdcch = scs_15kHz;
-  }else{  //NR_MIB__subCarrierSpacingCommon_scs30or120
-    scs_pdcch = scs_30kHz;
-  }
-
-  channel_bandwidth_t min_channel_bw = bw_10MHz;  //  deafult for testing
-	    
-  uint32_t is_condition_A = (ssb_subcarrier_offset == 0);   //  38.213 ch.13
-  frequency_range_t frequency_range = FR1;
-  uint32_t index_4msb = (mac->mib->pdcch_ConfigSIB1.controlResourceSetZero);
-  uint32_t index_4lsb = (mac->mib->pdcch_ConfigSIB1.searchSpaceZero);
-  int32_t num_rbs = -1;
-  int32_t num_symbols = -1;
-  int32_t rb_offset = -1;
-  //LOG_I(MAC,"<<<<<<<<<configSIB1 %d index_4msb %d index_4lsb %d scs_ssb %d scs_pdcch %d switch %d ",
-  //mac->mib->pdcch_ConfigSIB1,index_4msb,index_4lsb,scs_ssb,scs_pdcch, (scs_ssb << 5)|scs_pdcch);
-
-  //  type0-pdcch coreset
-  switch( (scs_ssb << 5)|scs_pdcch ){
-  case (scs_15kHz << 5) | scs_15kHz :
-    AssertFatal(index_4msb < 15, "38.213 Table 13-1 4 MSB out of range\n");
-    mac->type0_pdcch_ss_mux_pattern = 1;
-    num_rbs     = table_38213_13_1_c2[index_4msb];
-    num_symbols = table_38213_13_1_c3[index_4msb];
-    rb_offset   = table_38213_13_1_c4[index_4msb];
-    break;
-
-  case (scs_15kHz << 5) | scs_30kHz:
-    AssertFatal(index_4msb < 14, "38.213 Table 13-2 4 MSB out of range\n");
-    mac->type0_pdcch_ss_mux_pattern = 1;
-    num_rbs     = table_38213_13_2_c2[index_4msb];
-    num_symbols = table_38213_13_2_c3[index_4msb];
-    rb_offset   = table_38213_13_2_c4[index_4msb];
-    break;
-
-  case (scs_30kHz << 5) | scs_15kHz:
-    if((min_channel_bw & bw_5MHz) | (min_channel_bw & bw_10MHz)){
-      AssertFatal(index_4msb < 9, "38.213 Table 13-3 4 MSB out of range\n");
-      mac->type0_pdcch_ss_mux_pattern = 1;
-      num_rbs     = table_38213_13_3_c2[index_4msb];
-      num_symbols = table_38213_13_3_c3[index_4msb];
-      rb_offset   = table_38213_13_3_c4[index_4msb];
-    }else if(min_channel_bw & bw_40MHz){
-      AssertFatal(index_4msb < 9, "38.213 Table 13-5 4 MSB out of range\n");
-      mac->type0_pdcch_ss_mux_pattern = 1;
-      num_rbs     = table_38213_13_5_c2[index_4msb];
-      num_symbols = table_38213_13_5_c3[index_4msb];
-      rb_offset   = table_38213_13_5_c4[index_4msb];
-    }else{ ; }
-
-    break;
-
-  case (scs_30kHz << 5) | scs_30kHz:
-    if((min_channel_bw & bw_5MHz) | (min_channel_bw & bw_10MHz)){
-      mac->type0_pdcch_ss_mux_pattern = 1;
-      num_rbs     = table_38213_13_4_c2[index_4msb];
-      num_symbols = table_38213_13_4_c3[index_4msb];
-      rb_offset   = table_38213_13_4_c4[index_4msb];
-      LOG_I(MAC,"<<<<<<<<<index_4msb %d num_rbs %d num_symb %d rb_offset %d\n",index_4msb,num_rbs,num_symbols,rb_offset );
-    }else if(min_channel_bw & bw_40MHz){
-      AssertFatal(index_4msb < 10, "38.213 Table 13-6 4 MSB out of range\n");
-      mac->type0_pdcch_ss_mux_pattern = 1;
-      num_rbs     = table_38213_13_6_c2[index_4msb];
-      num_symbols = table_38213_13_6_c3[index_4msb];
-      rb_offset   = table_38213_13_6_c4[index_4msb];
-    }else{ ; }
-    break;
-
-  case (scs_120kHz << 5) | scs_60kHz:
-    AssertFatal(index_4msb < 12, "38.213 Table 13-7 4 MSB out of range\n");
-    if(index_4msb & 0x7){
-      mac->type0_pdcch_ss_mux_pattern = 1;
-    }else if(index_4msb & 0x18){
-      mac->type0_pdcch_ss_mux_pattern = 2;
-    }else{ ; }
-
-    num_rbs     = table_38213_13_7_c2[index_4msb];
-    num_symbols = table_38213_13_7_c3[index_4msb];
-    if(!is_condition_A && (index_4msb == 8 || index_4msb == 10)){
-      rb_offset   = table_38213_13_7_c4[index_4msb] - 1;
-    }else{
-      rb_offset   = table_38213_13_7_c4[index_4msb];
-    }
-    break;
-
-  case (scs_120kHz << 5) | scs_120kHz:
-    AssertFatal(index_4msb < 8, "38.213 Table 13-8 4 MSB out of range\n");
-    if(index_4msb & 0x3){
-      mac->type0_pdcch_ss_mux_pattern = 1;
-    }else if(index_4msb & 0x0c){
-      mac->type0_pdcch_ss_mux_pattern = 3;
-    }
-
-    num_rbs     = table_38213_13_8_c2[index_4msb];
-    num_symbols = table_38213_13_8_c3[index_4msb];
-    if(!is_condition_A && (index_4msb == 4 || index_4msb == 6)){
-      rb_offset   = table_38213_13_8_c4[index_4msb] - 1;
-    }else{
-      rb_offset   = table_38213_13_8_c4[index_4msb];
-    }
-    break;
-
-  case (scs_240kHz << 5) | scs_60kHz:
-    AssertFatal(index_4msb < 4, "38.213 Table 13-9 4 MSB out of range\n");
-    mac->type0_pdcch_ss_mux_pattern = 1;
-    num_rbs     = table_38213_13_9_c2[index_4msb];
-    num_symbols = table_38213_13_9_c3[index_4msb];
-    rb_offset   = table_38213_13_9_c4[index_4msb];
-    break;
-
-  case (scs_240kHz << 5) | scs_120kHz:
-    AssertFatal(index_4msb < 8, "38.213 Table 13-10 4 MSB out of range\n");
-    if(index_4msb & 0x3){
-      mac->type0_pdcch_ss_mux_pattern = 1;
-    }else if(index_4msb & 0x0c){
-      mac->type0_pdcch_ss_mux_pattern = 2;
-    }
-    num_rbs     = table_38213_13_10_c2[index_4msb];
-    num_symbols = table_38213_13_10_c3[index_4msb];
-    if(!is_condition_A && (index_4msb == 4 || index_4msb == 6)){
-      rb_offset   = table_38213_13_10_c4[index_4msb]-1;
-    }else{
-      rb_offset   = table_38213_13_10_c4[index_4msb];
-    }
-                
-    break;
-
-  default:
-    break;
-  }
-
-  AssertFatal(num_rbs != -1, "Type0 PDCCH coreset num_rbs undefined");
-  AssertFatal(num_symbols != -1, "Type0 PDCCH coreset num_symbols undefined");
-  AssertFatal(rb_offset != -1, "Type0 PDCCH coreset rb_offset undefined");
-        
-  //uint32_t cell_id = 0;   //  obtain from L1 later
-
-  //mac->type0_pdcch_dci_config.coreset.rb_start = rb_offset;
-  //mac->type0_pdcch_dci_config.coreset.rb_end = rb_offset + num_rbs - 1;
-  uint64_t mask = 0x0;
-  uint8_t i;
-  for(i=0; i<(num_rbs/6); ++i){   //  38.331 Each bit corresponds a group of 6 RBs
-    mask = mask >> 1;
-    mask = mask | 0x100000000000;
-  }
-  //LOG_I(MAC,">>>>>>>>mask %x num_rbs %d rb_offset %d\n", mask, num_rbs, rb_offset);
-
-//    mac->type0_pdcch_dci_config.coreset.frequency_domain_resource = mask;
-//    mac->type0_pdcch_dci_config.coreset.rb_offset = rb_offset;  //  additional parameter other than coreset
-//
-//    //mac->type0_pdcch_dci_config.type0_pdcch_coreset.duration = num_symbols;
-//    mac->type0_pdcch_dci_config.coreset.cce_reg_mapping_type = CCE_REG_MAPPING_TYPE_INTERLEAVED;
-//    mac->type0_pdcch_dci_config.coreset.cce_reg_interleaved_reg_bundle_size = 6;   //  L 38.211 7.3.2.2
-//    mac->type0_pdcch_dci_config.coreset.cce_reg_interleaved_interleaver_size = 2;  //  R 38.211 7.3.2.2
-//    mac->type0_pdcch_dci_config.coreset.cce_reg_interleaved_shift_index = cell_id;
-//    mac->type0_pdcch_dci_config.coreset.precoder_granularity = PRECODER_GRANULARITY_SAME_AS_REG_BUNDLE;
-//    mac->type0_pdcch_dci_config.coreset.pdcch_dmrs_scrambling_id = cell_id;
-
-
-
-  // type0-pdcch search space
-  float big_o;
-  float big_m;
-  uint32_t temp;
-  SFN_C_TYPE sfn_c=SFN_C_IMPOSSIBLE;   //  only valid for mux=1
-  uint32_t n_c=UINT_MAX;
-  uint32_t number_of_search_space_per_slot=UINT_MAX;
-  uint32_t first_symbol_index=UINT_MAX;
-  uint32_t search_space_duration;  //  element of search space
-  //  38.213 table 10.1-1
-
-  /// MUX PATTERN 1
-  if(mac->type0_pdcch_ss_mux_pattern == 1 && frequency_range == FR1){
-    big_o = table_38213_13_11_c1[index_4lsb];
-    number_of_search_space_per_slot = table_38213_13_11_c2[index_4lsb];
-    big_m = table_38213_13_11_c3[index_4lsb];
-
-    temp = (uint32_t)(big_o*pow(2, scs_pdcch)) + (uint32_t)(ssb_index*big_m);
-    n_c = temp / num_slot_per_frame;
-    if((temp/num_slot_per_frame) & 0x1){
-      sfn_c = SFN_C_MOD_2_EQ_1;
-    }else{
-      sfn_c = SFN_C_MOD_2_EQ_0;
-    }
-
-    if((index_4lsb == 1 || index_4lsb == 3 || index_4lsb == 5 || index_4lsb == 7) && (ssb_index&1)){
-      first_symbol_index = num_symbols;
-    }else{
-      first_symbol_index = table_38213_13_11_c4[index_4lsb];
-    }
-    //  38.213 chapter 13: over two consecutive slots
-    search_space_duration = 2;
-  }
-
-  if(mac->type0_pdcch_ss_mux_pattern == 1 && frequency_range == FR2){
-    big_o = table_38213_13_12_c1[index_4lsb];
-    number_of_search_space_per_slot = table_38213_13_11_c2[index_4lsb];
-    big_m = table_38213_13_12_c3[index_4lsb];
-
-    if((index_4lsb == 1 || index_4lsb == 3 || index_4lsb == 5 || index_4lsb == 10) && (ssb_index&1)){
-      first_symbol_index = 7;
-    }else if((index_4lsb == 6 || index_4lsb == 7 || index_4lsb == 8 || index_4lsb == 11) && (ssb_index&1)){
-      first_symbol_index = num_symbols;
-    }else{
-      first_symbol_index = 0;
-    }
-    //  38.213 chapter 13: over two consecutive slots
-    search_space_duration = 2;
-  }
-
-  /// MUX PATTERN 2
-  if(mac->type0_pdcch_ss_mux_pattern == 2){
-            
-    if((scs_ssb == scs_120kHz) && (scs_pdcch == scs_60kHz)){
-      //  38.213 Table 13-13
-      AssertFatal(index_4lsb == 0, "38.213 Table 13-13 4 LSB out of range\n");
-      //  PDCCH monitoring occasions (SFN and slot number) same as SSB frame-slot
-      //                sfn_c = SFN_C_EQ_SFN_SSB;
-      n_c = get_ssb_slot(ssb_index);
-      switch(ssb_index & 0x3){    //  ssb_index(i) mod 4
-      case 0: 
-	first_symbol_index = 0;
-	break;
-      case 1: 
-	first_symbol_index = 1;
-	break;
-      case 2: 
-	first_symbol_index = 6;
-	break;
-      case 3: 
-	first_symbol_index = 7;
-	break;
-      default: break; 
-      }
-                
-    }else if((scs_ssb == scs_240kHz) && (scs_pdcch == scs_120kHz)){
-      //  38.213 Table 13-14
-      AssertFatal(index_4lsb == 0, "38.213 Table 13-14 4 LSB out of range\n");
-      //  PDCCH monitoring occasions (SFN and slot number) same as SSB frame-slot
-      //                sfn_c = SFN_C_EQ_SFN_SSB;
-      n_c = get_ssb_slot(ssb_index);
-      switch(ssb_index & 0x7){    //  ssb_index(i) mod 8
-      case 0: 
-	first_symbol_index = 0;
-	break;
-      case 1: 
-	first_symbol_index = 1;
-	break;
-      case 2: 
-	first_symbol_index = 2;
-	break;
-      case 3: 
-	first_symbol_index = 3;
-	break;
-      case 4: 
-	first_symbol_index = 12;
-	n_c = get_ssb_slot(ssb_index) - 1;
-	break;
-      case 5: 
-	first_symbol_index = 13;
-	n_c = get_ssb_slot(ssb_index) - 1;
-	break;
-      case 6: 
-	first_symbol_index = 0;
-	break;
-      case 7: 
-	first_symbol_index = 1;
-	break;
-      default: break; 
-      }
-    }else{ ; }
-    //  38.213 chapter 13: over one slot
-    search_space_duration = 1;
-  }
-
-  /// MUX PATTERN 3
-  if(mac->type0_pdcch_ss_mux_pattern == 3){
-    if((scs_ssb == scs_120kHz) && (scs_pdcch == scs_120kHz)){
-      //  38.213 Table 13-15
-      AssertFatal(index_4lsb == 0, "38.213 Table 13-15 4 LSB out of range\n");
-      //  PDCCH monitoring occasions (SFN and slot number) same as SSB frame-slot
-      //                sfn_c = SFN_C_EQ_SFN_SSB;
-      n_c = get_ssb_slot(ssb_index);
-      switch(ssb_index & 0x3){    //  ssb_index(i) mod 4
-      case 0: 
-	first_symbol_index = 4;
-	break;
-      case 1: 
-	first_symbol_index = 8;
-	break;
-      case 2: 
-	first_symbol_index = 2;
-	break;
-      case 3: 
-	first_symbol_index = 6;
-	break;
-      default: break; 
-      }
-    }else{ ; }
-    //  38.213 chapter 13: over one slot
-    search_space_duration = 1;
-  }
-
-  AssertFatal(number_of_search_space_per_slot!=UINT_MAX,"");
-
-//  uint32_t coreset_duration = num_symbols * number_of_search_space_per_slot;
-//    mac->type0_pdcch_dci_config.number_of_candidates[0] = table_38213_10_1_1_c2[0];
-//    mac->type0_pdcch_dci_config.number_of_candidates[1] = table_38213_10_1_1_c2[1];
-//    mac->type0_pdcch_dci_config.number_of_candidates[2] = table_38213_10_1_1_c2[2];   //  CCE aggregation level = 4
-//    mac->type0_pdcch_dci_config.number_of_candidates[3] = table_38213_10_1_1_c2[3];   //  CCE aggregation level = 8
-//    mac->type0_pdcch_dci_config.number_of_candidates[4] = table_38213_10_1_1_c2[4];   //  CCE aggregation level = 16
-//    mac->type0_pdcch_dci_config.duration = search_space_duration;
-//    mac->type0_pdcch_dci_config.coreset.duration = coreset_duration;   //  coreset
-//    AssertFatal(first_symbol_index!=UINT_MAX,"");
-//    mac->type0_pdcch_dci_config.monitoring_symbols_within_slot = (0x3fff << first_symbol_index) & (0x3fff >> (14-coreset_duration-first_symbol_index)) & 0x3fff;
-
-  AssertFatal(sfn_c!=SFN_C_IMPOSSIBLE,"");
-  AssertFatal(n_c!=UINT_MAX,"");
-  mac->type0_pdcch_ss_sfn_c = sfn_c;
-  mac->type0_pdcch_ss_n_c = n_c;
-        
-  // fill in the elements in config request inside P5 message
-  mac->phy_config.Mod_id = module_id;
-  mac->phy_config.CC_id = cc_id;
-
-  mac->dl_config_request.sfn = frame;
-  mac->dl_config_request.slot = (ssb_index>>1) + ((ssb_index>>4)<<1); // not valid for 240kHz SCS
-*/
-  //}
   return 0;
 
 }
@@ -3880,8 +3520,8 @@ int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
         break;
       }
     break;
-       }
-    
+  }
+
     return dci_format;
 }
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index ad8409de69..2974f28a4e 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -349,6 +349,8 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
   
   if (secondaryCellGroup) {
 
+    RC.nrmac[Mod_idP]->secondaryCellGroupCommon = secondaryCellGroup;
+
     NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
     if (add_ue == 1 && get_softmodem_params()->phy_test) {
       const int UE_id = add_new_nr_ue(Mod_idP,rnti);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
index 856d1937b1..db7493b4fe 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
@@ -458,14 +458,13 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   }
 
   // This schedules SIB1
-  if(slot  == 15){
-    schedule_nr_sib1(module_idP, frame, slot);
-  }
+  schedule_nr_sib1(module_idP, frame, slot);
 
 
   // This schedule PRACH if we are not in phy_test mode
-  if (get_softmodem_params()->phy_test == 0)
+  if (get_softmodem_params()->phy_test == 0) {
     schedule_nr_prach(module_idP, frame, slot);
+  }
 
   // This schedule SR
   // TODO
@@ -513,8 +512,9 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
     ue_sched_ctl->ta_apply = false;
   }
 
-  if (UE_info->active[UE_id])
+  if (UE_info->active[UE_id]) {
     nr_schedule_pucch(module_idP, UE_id, nr_ulmix_slots, frame, slot);
+  }
 
   stop_meas(&RC.nrmac[module_idP]->eNB_scheduler);
   
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
index f64a3ba981..a4e36f0c3c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
@@ -30,6 +30,7 @@
 
  */
 
+#include <GNB_APP/RRC_nr_paramsvalues.h>
 #include "assertions.h"
 #include "NR_MAC_gNB/nr_mac_gNB.h"
 #include "NR_MAC_gNB/mac_proto.h"
@@ -38,28 +39,26 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
 #include "OCG.h"
-#include "OCG_extern.h"
 #include "RRC/NR/nr_rrc_extern.h"
 #include "common/utils/nr/nr_common.h"
 
 
-//#include "LAYER2/MAC/pre_processor.c"
 #include "pdcp.h"
 
-#include "intertask_interface.h"
-
 #define ENABLE_MAC_PAYLOAD_DEBUG
 #define DEBUG_eNB_SCHEDULER 1
 
 #include "common/ran_context.h"
 
+#include "executables/softmodem-common.h"
+
 extern RAN_CONTEXT_t RC;
 
 void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP){
 
-  gNB_MAC_INST *gNB = RC.nrmac[module_idP];
+  gNB_MAC_INST *gNB_mac = RC.nrmac[module_idP];
   NR_COMMON_channels_t *cc;
-  
+
   nfapi_nr_dl_tti_request_t      *dl_tti_request;
   nfapi_nr_dl_tti_request_body_t *dl_req;
   nfapi_nr_dl_tti_request_pdu_t  *dl_config_pdu;
@@ -72,9 +71,9 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP){
 
   for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
 
-    dl_tti_request = &gNB->DL_req[CC_id];
+    dl_tti_request = &gNB_mac->DL_req[CC_id];
     dl_req = &dl_tti_request->dl_tti_request_body;
-    cc = &gNB->common_channels[CC_id];
+    cc = &gNB_mac->common_channels[CC_id];
 
     mib_sdu_length = mac_rrc_nr_data_req(module_idP, CC_id, frameP, MIBCH, 1, &cc->MIB_pdu.payload[0]); // not used in this case
 
@@ -107,30 +106,30 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP){
       uint32_t ssb_offset0 = *cc->ServingCellConfigCommon->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB - cc->ServingCellConfigCommon->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA;
       int ratio;
       switch (*cc->ServingCellConfigCommon->ssbSubcarrierSpacing) {
-      case NR_SubcarrierSpacing_kHz15:
-	AssertFatal(band <= 79, "Band %ld is not possible for SSB with 15 kHz SCS\n",band);
-	if (band<77) // below 3GHz
-	  ratio=3; // NRARFCN step is 5 kHz
-	else
-	  ratio=1; // NRARFCN step is 15 kHz
-	break;
-      case NR_SubcarrierSpacing_kHz30:
-	AssertFatal(band <= 79, "Band %ld is not possible for SSB with 15 kHz SCS\n",band);
-	if (band<77) // below 3GHz
-	  ratio=6; // NRARFCN step is 5 kHz
-	else
-	  ratio=2; // NRARFCN step is 15 kHz
-	break;
-      case NR_SubcarrierSpacing_kHz120:
-	AssertFatal(band >= 257, "Band %ld is not possible for SSB with 120 kHz SCS\n",band);
-	ratio=2; // NRARFCN step is 15 kHz
-	break;
-      case NR_SubcarrierSpacing_kHz240:
-	AssertFatal(band >= 257, "Band %ld is not possible for SSB with 240 kHz SCS\n",band);
-	ratio=4; // NRARFCN step is 15 kHz
-	break;
-      default:
-        AssertFatal(1==0,"SCS %ld not allowed for SSB \n", *cc->ServingCellConfigCommon->ssbSubcarrierSpacing);
+        case NR_SubcarrierSpacing_kHz15:
+          AssertFatal(band <= 79, "Band %ld is not possible for SSB with 15 kHz SCS\n",band);
+          if (band<77) // below 3GHz
+            ratio=3; // NRARFCN step is 5 kHz
+          else
+            ratio=1; // NRARFCN step is 15 kHz
+          break;
+        case NR_SubcarrierSpacing_kHz30:
+          AssertFatal(band <= 79, "Band %ld is not possible for SSB with 15 kHz SCS\n",band);
+          if (band<77) // below 3GHz
+            ratio=6; // NRARFCN step is 5 kHz
+          else
+            ratio=2; // NRARFCN step is 15 kHz
+          break;
+        case NR_SubcarrierSpacing_kHz120:
+          AssertFatal(band >= 257, "Band %ld is not possible for SSB with 120 kHz SCS\n",band);
+          ratio=2; // NRARFCN step is 15 kHz
+          break;
+        case NR_SubcarrierSpacing_kHz240:
+          AssertFatal(band >= 257, "Band %ld is not possible for SSB with 240 kHz SCS\n",band);
+          ratio=4; // NRARFCN step is 15 kHz
+          break;
+        default:
+          AssertFatal(1==0,"SCS %ld not allowed for SSB \n", *cc->ServingCellConfigCommon->ssbSubcarrierSpacing);
       }
       dl_config_pdu->ssb_pdu.ssb_pdu_rel15.SsbSubcarrierOffset = 0; //kSSB
       dl_config_pdu->ssb_pdu.ssb_pdu_rel15.ssbOffsetPointA     = ssb_offset0/(ratio*12) - 10; // absoluteFrequencySSB is the center of SSB
@@ -144,201 +143,213 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP){
         vrb_map[rbStart + rb] = 1;
     }
   }
-}
-
-void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP) {
-
-  printf("\n\n--- Schedule_nr_sib1: Start\n");
 
   // Get type0_PDCCH_CSS_config parameters
   PHY_VARS_gNB *gNB = RC.gNB[module_idP];
-  gNB_MAC_INST *mac = RC.nrmac[module_idP];
   NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
   NR_MIB_t *mib = RC.nrrrc[module_idP]->carrier.mib.message.choice.mib;
   uint8_t gNB_xtra_byte = 0;
   for (int i = 0; i < 8; i++) {
     gNB_xtra_byte |= ((gNB->pbch.pbch_a >> (31 - i)) & 1) << (7 - i);
   }
-  get_type0_PDCCH_CSS_config_parameters(&mac->type0_PDCCH_CSS_config, mib, gNB_xtra_byte, frame_parms->Lmax,
+  get_type0_PDCCH_CSS_config_parameters(&gNB_mac->type0_PDCCH_CSS_config, mib, gNB_xtra_byte, frame_parms->Lmax,
                                         frame_parms->ssb_index);
+}
 
+void schedule_control_sib1(module_id_t module_id,
+                           int CC_id,
+                           int bwp_id,
+                           int time_domain_allocation,
+                           uint8_t mcsTableIdx,
+                           uint8_t mcs,
+                           uint8_t numDmrsCdmGrpsNoData) {
 
-  // Get SIB1
-  int CC_id = 0;
-  uint8_t sib1_payload[100];
-  uint8_t sib1_sdu_length = mac_rrc_nr_data_req(module_idP, CC_id, frameP, BCCH, 1, sib1_payload);
-  printf("sib1_sdu_length = %i\n", sib1_sdu_length);
-  for(int i = 0; i<sib1_sdu_length; i++) {
-    printf("%i ", sib1_payload[i]);
+  gNB_MAC_INST *gNB_mac = RC.nrmac[module_id];
+  NR_BWP_Downlink_t *bwp = gNB_mac->secondaryCellGroupCommon->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[bwp_id-1];
 
+  if (gNB_mac->sched_ctrlCommon == NULL){
+    gNB_mac->sched_ctrlCommon = calloc(1,sizeof(*gNB_mac->sched_ctrlCommon));
+    gNB_mac->sched_ctrlCommon->search_space = calloc(1,sizeof(*gNB_mac->sched_ctrlCommon->search_space));
+    gNB_mac->sched_ctrlCommon->active_bwp = calloc(1,sizeof(*gNB_mac->sched_ctrlCommon->active_bwp));
+    gNB_mac->sched_ctrlCommon->coreset = calloc(1,sizeof(*gNB_mac->sched_ctrlCommon->coreset));
+    fill_default_searchSpaceZero(gNB_mac->sched_ctrlCommon->search_space);
+    fill_default_coresetZero(gNB_mac->sched_ctrlCommon->coreset);
   }
-  printf("\n");
 
+  gNB_mac->sched_ctrlCommon->active_bwp = bwp;
+  gNB_mac->sched_ctrlCommon->rbSize = 0;
+  gNB_mac->sched_ctrlCommon->time_domain_allocation = time_domain_allocation;
+  gNB_mac->sched_ctrlCommon->mcsTableIdx = mcsTableIdx;
+  gNB_mac->sched_ctrlCommon->mcs = mcs;
+  gNB_mac->sched_ctrlCommon->numDmrsCdmGrpsNoData = numDmrsCdmGrpsNoData;
 
+  uint8_t nr_of_candidates;
+  find_aggregation_candidates(&gNB_mac->sched_ctrlCommon->aggregation_level, &nr_of_candidates,gNB_mac->sched_ctrlCommon->search_space);
 
-  // Schedule SIB1
+  gNB_mac->sched_ctrlCommon->cce_index = allocate_nr_CCEs(RC.nrmac[module_id],
+                                                          gNB_mac->sched_ctrlCommon->active_bwp,
+                                                          gNB_mac->sched_ctrlCommon->coreset,
+                                                          gNB_mac->sched_ctrlCommon->aggregation_level,
+                                                          0,
+                                                          0);
 
-  int UE_id = 0;
-  int mcsIndex = 0;
-  int startSymbolAndLength = 0;
-  int NrOfSymbols = 14;
-  int StartSymbolIndex_tmp;
-  int NrOfSymbols_tmp;
-  int StartSymbolIndex = -1;
-  int time_domain_assignment = 0;
-  int dci10_bw;
-  long locationAndBandwidth;
-  int target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
+  // Frequency-domain allocation
+  const uint16_t bwpSize = NRRIV2BW(gNB_mac->sched_ctrlCommon->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
+  int rbStart = NRRIV2PRBOFFSET(gNB_mac->sched_ctrlCommon->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
+  uint8_t *vrb_map = RC.nrmac[module_id]->common_channels[CC_id].vrb_map;
+  while (rbStart < bwpSize && vrb_map[rbStart]) {
+    rbStart++;
+  }
 
-  NR_COMMON_channels_t *cc          = &mac->common_channels[CC_id];
-  NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
+  // Calculate number of PRB_DMRS
+  uint8_t N_PRB_DMRS;
+  if(gNB_mac->sched_ctrlCommon->active_bwp->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NFAPI_NR_DMRS_TYPE1) {
+    N_PRB_DMRS = gNB_mac->sched_ctrlCommon->numDmrsCdmGrpsNoData * 6;
+  } else {
+    N_PRB_DMRS = gNB_mac->sched_ctrlCommon->numDmrsCdmGrpsNoData * 4;
+  }
 
-  NR_UE_info_t *UE_info                     = &RC.nrmac[module_idP]->UE_info;
-  NR_CellGroupConfig_t *secondaryCellGroup  = UE_info->secondaryCellGroup[UE_id];
-  NR_UE_sched_ctrl_t   *sched_ctrl          = &UE_info->UE_sched_ctrl[UE_id];
-  long bwp_Id                               = sched_ctrl->active_bwp->bwp_Id;
+  // Calculate number of symbols
+  struct NR_PDSCH_TimeDomainResourceAllocationList *tdaList = gNB_mac->sched_ctrlCommon->active_bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList;
+  const int startSymbolAndLength = tdaList->list.array[gNB_mac->sched_ctrlCommon->time_domain_allocation]->startSymbolAndLength;
+  int startSymbolIndex, nrOfSymbols;
+  SLIV2SL(startSymbolAndLength, &startSymbolIndex, &nrOfSymbols);
 
-  nfapi_nr_dl_tti_request_body_t  *dl_req   = &mac->DL_req[CC_id].dl_tti_request_body;
-  nfapi_nr_pdu_t                  *tx_req   = &mac->TX_req[CC_id].pdu_list[mac->TX_req[CC_id].Number_of_PDUs];
+  // Calculate rbStart and rbSize
+  int rbSize = 0;
+  uint32_t TBS = 0;
+  do {
+    rbSize++;
+    TBS = nr_compute_tbs(nr_get_Qm_dl(gNB_mac->sched_ctrlCommon->mcs, gNB_mac->sched_ctrlCommon->mcsTableIdx),
+                         nr_get_code_rate_dl(gNB_mac->sched_ctrlCommon->mcs, gNB_mac->sched_ctrlCommon->mcsTableIdx),
+                         rbSize, nrOfSymbols, N_PRB_DMRS,0,0,1) >> 3;
+  } while (rbStart + rbSize < bwpSize && !vrb_map[rbStart + rbSize] && TBS < 0);
+  gNB_mac->sched_ctrlCommon->rbSize = rbSize;
+  gNB_mac->sched_ctrlCommon->rbStart = rbStart;
 
-  NR_SearchSpace_t *ss;
+  // Mark the corresponding RBs as used
+  for (int rb = 0; rb < gNB_mac->sched_ctrlCommon->rbSize; rb++) {
+    vrb_map[rb + gNB_mac->sched_ctrlCommon->rbStart] = 1;
+  }
 
-  nfapi_nr_dl_tti_request_pdu_t   *dl_tti_pdcch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
+  printf("searchSpaceId = %li\n", gNB_mac->sched_ctrlCommon->search_space->searchSpaceId);
+  printf("locationAndBandwidth = %li\n", gNB_mac->sched_ctrlCommon->active_bwp->bwp_Common->genericParameters.locationAndBandwidth);
+  printf("cce_index = %i\n", gNB_mac->sched_ctrlCommon->cce_index);
+  printf("aggregation_level = %i\n", gNB_mac->sched_ctrlCommon->aggregation_level);
+  printf("nr_of_candidates = %i\n", nr_of_candidates);
+  printf("startSymbolIndex = %i\n", startSymbolIndex);
+  printf("nrOfSymbols = %i\n", nrOfSymbols);
+  printf("rbSize = %i\n", rbSize);
+  printf("rbStart = %i\n", rbStart);
+  printf("TBS = %i\n", TBS);
+  printf("N_PRB_DMRS = %i\n", N_PRB_DMRS);
+}
+
+void nr_fill_nfapi_dci_sib1_pdu(int Mod_idP, rnti_t rnti, nfapi_nr_dl_tti_request_body_t *dl_req) {
+
+  gNB_MAC_INST *gNB_mac = RC.nrmac[Mod_idP];
+  NR_ServingCellConfigCommon_t *scc = gNB_mac->common_channels->ServingCellConfigCommon;
+  NR_BWP_Downlink_t *bwp = gNB_mac->sched_ctrlCommon->active_bwp;
+
+  long locationAndBandwidth = bwp->bwp_Common->genericParameters.locationAndBandwidth;
+  int dci10_bw = NRRIV2BW(locationAndBandwidth,275);
+
+  nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdcch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
   memset((void*)dl_tti_pdcch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
   dl_tti_pdcch_pdu->PDUType = NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE;
   dl_tti_pdcch_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdcch_pdu));
 
-  nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdsch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs+1];
-  memset((void *)dl_tti_pdsch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
-  dl_tti_pdsch_pdu->PDUType = NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE;
-  dl_tti_pdsch_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdsch_pdu));
-
   nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15 = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
-  nfapi_nr_dl_tti_pdsch_pdu_rel15_t *pdsch_pdu_rel15 = &dl_tti_pdsch_pdu->pdsch_pdu.pdsch_pdu_rel15;
-
-  NR_BWP_Downlink_t *bwp    = secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[bwp_Id - 1];
-  NR_BWP_Uplink_t   *ubwp   = secondaryCellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList->list.array[bwp_Id-1];
-
-  pdsch_pdu_rel15->pduBitmap = 0;
-  pdsch_pdu_rel15->rnti = 0; //UE_info->rnti[UE_id];
-  pdsch_pdu_rel15->pduIndex = 0; //mac->pdu_index[0]++;
-
-  pdsch_pdu_rel15->BWPSize  = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
-  pdsch_pdu_rel15->BWPStart = NRRIV2PRBOFFSET(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
-  pdsch_pdu_rel15->SubcarrierSpacing = bwp->bwp_Common->genericParameters.subcarrierSpacing;
-  pdsch_pdu_rel15->CyclicPrefix = 0;
-  pdsch_pdu_rel15->NrOfCodewords = 1;
-  pdsch_pdu_rel15->targetCodeRate[0] = nr_get_code_rate_dl(mcsIndex,0);
-  pdsch_pdu_rel15->qamModOrder[0] = 2;
-  pdsch_pdu_rel15->mcsIndex[0] = mcsIndex;
-  if (bwp->bwp_Dedicated->pdsch_Config->choice.setup->mcs_Table == NULL)
-    pdsch_pdu_rel15->mcsTable[0] = 0;
-  else{
-    if (*bwp->bwp_Dedicated->pdsch_Config->choice.setup->mcs_Table == 0)
-      pdsch_pdu_rel15->mcsTable[0] = 1;
-    else
-      pdsch_pdu_rel15->mcsTable[0] = 2;
-  }
-  pdsch_pdu_rel15->rvIndex[0] = 0;
-  pdsch_pdu_rel15->dataScramblingId = *scc->physCellId;
-  pdsch_pdu_rel15->nrOfLayers = 1;
-  pdsch_pdu_rel15->transmissionScheme = 0;
-  pdsch_pdu_rel15->refPoint = 0;
-  pdsch_pdu_rel15->dmrsConfigType = 0;
-  pdsch_pdu_rel15->dlDmrsScramblingId = *scc->physCellId;
-  pdsch_pdu_rel15->SCID = 0;
-  pdsch_pdu_rel15->numDmrsCdmGrpsNoData = 2;
-  pdsch_pdu_rel15->dmrsPorts = 1;
-  pdsch_pdu_rel15->resourceAlloc = 1;
-  pdsch_pdu_rel15->rbStart = 0;
-  pdsch_pdu_rel15->rbSize = 6;
-  pdsch_pdu_rel15->VRBtoPRBMapping = 0; // non interleaved
-
-
-  for (int i=0; i<bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list.count; i++) {
-    startSymbolAndLength = bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list.array[i]->startSymbolAndLength;
-    SLIV2SL(startSymbolAndLength, &StartSymbolIndex_tmp, &NrOfSymbols_tmp);
-    if (NrOfSymbols_tmp < NrOfSymbols) {
-      NrOfSymbols = NrOfSymbols_tmp;
-      StartSymbolIndex = StartSymbolIndex_tmp;
-      time_domain_assignment = i; // this is short PDSCH added to the config to fit mixed slot
-    }
-  }
-
-  pdsch_pdu_rel15->StartSymbolIndex = StartSymbolIndex;
-  pdsch_pdu_rel15->NrOfSymbols      = NrOfSymbols;
-  pdsch_pdu_rel15->dlDmrsSymbPos    = fill_dmrs_mask(NULL, scc->dmrs_TypeA_Position, NrOfSymbols);
-
-  locationAndBandwidth = scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth;
-  dci10_bw = NRRIV2BW(locationAndBandwidth,275);
 
   dci_pdu_rel15_t dci_pdu_rel15[MAX_DCI_CORESET];
-  dci_pdu_rel15[0].frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(pdsch_pdu_rel15->rbSize,
-                                                                                       pdsch_pdu_rel15->rbStart,dci10_bw);
-  dci_pdu_rel15[0].time_domain_assignment.val = time_domain_assignment;
-  dci_pdu_rel15[0].vrb_to_prb_mapping.val = 0;
-  dci_pdu_rel15[0].mcs = pdsch_pdu_rel15->mcsIndex[0];
-  dci_pdu_rel15[0].tb_scaling = 0;
+  memset(dci_pdu_rel15, 0, sizeof(dci_pdu_rel15_t) * MAX_DCI_CORESET);
 
-  int found = 0;
-  for ( int i=0; i<bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList->list.count; i++) {
-    ss=bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList->list.array[i];
-    if (ss->searchSpaceType->present == target_ss) {
-      found=1;
-      break;
-    }
-  }
+  dci_pdu_rel15[0].bwp_indicator.val = gNB_mac->sched_ctrlCommon->active_bwp->bwp_Id - 1;
+  dci_pdu_rel15[0].frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(gNB_mac->sched_ctrlCommon->rbSize,
+                                                                                       gNB_mac->sched_ctrlCommon->rbStart,
+                                                                                       dci10_bw);
 
-  uint8_t nr_of_candidates, aggregation_level;
-  find_aggregation_candidates(&aggregation_level, &nr_of_candidates, ss);
-  NR_ControlResourceSet_t *coreset = get_coreset(bwp, ss, 0);
-  int CCEIndex = allocate_nr_CCEs(mac,bwp,coreset,aggregation_level,0,0);
+  dci_pdu_rel15[0].time_domain_assignment.val = gNB_mac->sched_ctrlCommon->time_domain_allocation;
+  dci_pdu_rel15[0].mcs = gNB_mac->sched_ctrlCommon->mcs;
+  dci_pdu_rel15[0].rv = 0;
+  dci_pdu_rel15[0].harq_pid = 0;
+  dci_pdu_rel15[0].ndi = 0;
+  dci_pdu_rel15[0].dai[0].val = 0;
+  dci_pdu_rel15[0].tpc = 0;
+  dci_pdu_rel15[0].pucch_resource_indicator = 0;
+  dci_pdu_rel15[0].pdsch_to_harq_feedback_timing_indicator.val = 0;
+  dci_pdu_rel15[0].antenna_ports.val = 0;
+  dci_pdu_rel15[0].dmrs_sequence_initialization.val = 0;
 
-  if (CCEIndex < 0) {
-    LOG_E(MAC, "%s(): cannot find free CCE for RNTI %04x!\n", __func__, pdsch_pdu_rel15->rnti);
-    return;
-  }
-
-  nr_configure_pdcch(mac,
+  nr_configure_pdcch(gNB_mac,
                      pdcch_pdu_rel15,
-                     pdsch_pdu_rel15->rnti,
-                     ss,
-                     coreset,
+                     rnti,
+                     gNB_mac->sched_ctrlCommon->search_space,
+                     gNB_mac->sched_ctrlCommon->coreset,
                      scc,
                      bwp,
-                     aggregation_level,
-                     CCEIndex);
+                     gNB_mac->sched_ctrlCommon->aggregation_level,
+                     gNB_mac->sched_ctrlCommon->cce_index);
 
-  LOG_I(MAC, "Frame %d: Subframe %d : Adding common DL DCI for RNTI %x\n", frameP, slotP, pdsch_pdu_rel15->rnti);
+  int dci_formats[2];
+  int rnti_types[2];
+  dci_formats[0]  = NR_DL_DCI_FORMAT_1_0;
+  rnti_types[0]   = NR_RNTI_SI;
 
-  int dci_formats[2], rnti_types[2];
-  dci_formats[0] = NR_DL_DCI_FORMAT_1_0;
-  rnti_types[0] = NR_RNTI_SI;
-  fill_dci_pdu_rel15(scc,secondaryCellGroup,pdcch_pdu_rel15, &dci_pdu_rel15[0], dci_formats, rnti_types,dci10_bw,bwp_Id);
+  fill_dci_pdu_rel15(scc,gNB_mac->secondaryCellGroupCommon,pdcch_pdu_rel15,dci_pdu_rel15,dci_formats,rnti_types, dci10_bw,bwp->bwp_Id);
 
-  dl_req->nPDUs+=2;
+  dl_req->nPDUs += 1;
 
-  int x_Overhead = 0;
-  nr_get_tbs_dl(&dl_tti_pdsch_pdu->pdsch_pdu, x_Overhead, pdsch_pdu_rel15->numDmrsCdmGrpsNoData, dci_pdu_rel15[0].tb_scaling);
+  printf("locationAndBandwidth = %li\n", locationAndBandwidth);
+  printf("dci10_bw = %i\n", dci10_bw);
+}
 
-  // DL TX request
-  tx_req->PDU_length = pdsch_pdu_rel15->TBSize[0];
-  tx_req->PDU_index = mac->pdu_index[CC_id]++;
-  tx_req->num_TLV = 1;
-  tx_req->TLVs[0].length = sib1_sdu_length;
-  mac->TX_req[CC_id].SFN = frameP;
-  mac->TX_req[CC_id].Number_of_PDUs++;
-  mac->TX_req[CC_id].Slot = slotP;
-  memcpy((void*)&tx_req->TLVs[0].value.direct[0], (void*)sib1_payload, sib1_sdu_length);
+void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP) {
+
+  printf("\n\n--- Schedule_nr_sib1: Start\n");
+  printf("frameP = %i, slotP = %i\n", frameP, slotP);
+
+  int CC_id = 0;
+  rnti_t rnti = 0x1234;
+  int bwp_id = 1;
+  int time_domain_allocation = 2;
+  uint8_t mcsTableIdx = 0;
+  uint8_t mcs = 9;
+  uint8_t numDmrsCdmGrpsNoData = 1;
+
+  gNB_MAC_INST *gNB_mac = RC.nrmac[module_idP];
+
+  // TODO: Check at gNB_mac->type0_PDCCH_CSS_config if it is to transmit (structure arrives here updated)
+  bool is_to_transmit_sib1 = false;
+  is_to_transmit_sib1 = slotP  == 10;
+
+  if(is_to_transmit_sib1) {
+
+    printf("SIB1 will be transmitted here\n");
+
+    // Computation of the sched_ctrlCommon: bwp, coreset0, rbStart, rbSize, etc.
+    schedule_control_sib1(module_idP, CC_id, bwp_id, time_domain_allocation, mcsTableIdx, mcs, numDmrsCdmGrpsNoData);
+
+    // Schedule broadcast DCI for the SIB1
+    nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
+    nr_fill_nfapi_dci_sib1_pdu(module_idP, rnti, dl_req);
+
+    // Get SIB1
+    uint8_t sib1_payload[100];
+    uint8_t sib1_sdu_length = mac_rrc_nr_data_req(module_idP, CC_id, frameP, BCCH, 1, sib1_payload);
+    printf("sib1_sdu_length = %i\n", sib1_sdu_length);
+    for(int i = 0; i<sib1_sdu_length; i++) {
+      printf("%i ", sib1_payload[i]);
+
+    }
+    printf("\n");
+
+    // TODO: Schedule broadcast the SIB1
 
-  // Mark the corresponding RBs as used
-  uint8_t *vrb_map = cc[CC_id].vrb_map;
-  for (int rb = 0; rb < pdsch_pdu_rel15->rbSize; rb++) {
-    vrb_map[rb + pdsch_pdu_rel15->rbStart] = 1;
   }
 
+    printf("--- Schedule_nr_sib1: End\n\n\n");
 
-  printf("--- Schedule_nr_sib1: End\n\n\n");
 }
 
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index a686215fd5..968c280f2e 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -63,6 +63,7 @@
 #define ENABLE_MAC_PAYLOAD_DEBUG
 #define DEBUG_gNB_SCHEDULER 1
 
+
 #include "common/ran_context.h"
 
 extern RAN_CONTEXT_t RC;
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index d33ad37be7..e8f26a06a1 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -443,6 +443,8 @@ typedef struct gNB_MAC_INST_s {
   /// CCE lists
   int cce_list[MAX_NUM_BWP][MAX_NUM_CORESET][MAX_NUM_CCE];
 
+  NR_UE_sched_ctrl_t *sched_ctrlCommon;
+  NR_CellGroupConfig_t *secondaryCellGroupCommon;
   NR_Type0_PDCCH_CSS_config_t type0_PDCCH_CSS_config;
 
 } gNB_MAC_INST;
diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
index 5d620181d1..ec393e7eda 100644
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
@@ -190,6 +190,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
                       (dl_info->rx_ind->rx_indication_body+i)->sib_pdu.pdu,
                       (dl_info->rx_ind->rx_indication_body+i)->sib_pdu.pdu_length)) << FAPI_NR_RX_PDU_TYPE_SIB;
 
+            LOG_D(MAC,"[L2][IF MODULE][DL INDICATION][RX_IND], SIB case Number of PDUs: %d \n", dl_info->rx_ind->number_pdus);
           break;
 
         case FAPI_NR_RX_PDU_TYPE_DLSCH:
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index 3a6bbfd5a3..26eab29fd7 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -71,6 +71,10 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
 
 void rrc_remove_nsa_user(gNB_RRC_INST *rrc, int rnti);
 
+void fill_default_coresetZero(NR_ControlResourceSet_t *coreset0);
+
+void fill_default_searchSpaceZero(NR_SearchSpace_t *ss0);
+
 void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
 				     NR_CellGroupConfig_t *secondaryCellGroup,
 				     int scg_id,
diff --git a/openair2/RRC/NR/rrc_gNB_reconfig.c b/openair2/RRC/NR/rrc_gNB_reconfig.c
index b8962051d8..777baae549 100644
--- a/openair2/RRC/NR/rrc_gNB_reconfig.c
+++ b/openair2/RRC/NR/rrc_gNB_reconfig.c
@@ -47,6 +47,71 @@
 #define false 0
 #define true 1
 
+void fill_default_coresetZero(NR_ControlResourceSet_t *coreset0) {
+
+  coreset0->controlResourceSetId = 0;
+
+  // frequencyDomainResources '11111111 11111111 00000000 00000000 00000000 00000'B,
+  if(coreset0->frequencyDomainResources.buf == NULL) coreset0->frequencyDomainResources.buf = calloc(1,6);
+  coreset0->frequencyDomainResources.buf[0] = 0xff;
+  coreset0->frequencyDomainResources.buf[1] = 0xff;
+  coreset0->frequencyDomainResources.buf[2] = 0;
+  coreset0->frequencyDomainResources.buf[3] = 0;
+  coreset0->frequencyDomainResources.buf[4] = 0;
+  coreset0->frequencyDomainResources.buf[5] = 0;
+  coreset0->frequencyDomainResources.size = 6;
+  coreset0->frequencyDomainResources.bits_unused = 3;
+  coreset0->duration = 1;
+  coreset0->cce_REG_MappingType.present = NR_ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved; // FIXME: Interleaved
+  //coreset0->cce_REG_MappingType.choice.interleaved=calloc(1,sizeof(*coreset->cce_REG_MappingType.choice.interleaved));
+  //coreset0->cce_REG_MappingType.choice.interleaved->interleaverSize = NR_ControlResourceSet__cce_REG_MappingType__interleaved__interleaverSize_n2;
+  //coreset0->cce_REG_MappingType.choice.interleaved->shiftIndex = scc->physCellId;
+  coreset0->precoderGranularity = NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle;
+
+  if(coreset0->tci_StatesPDCCH_ToAddList == NULL) coreset0->tci_StatesPDCCH_ToAddList = calloc(1,sizeof(*coreset0->tci_StatesPDCCH_ToAddList));
+
+  NR_TCI_StateId_t *tci[8];
+  for (int i=0;i<8;i++) {
+    tci[i]=calloc(1,sizeof(*tci[i]));
+    *tci[i] = i;
+    ASN_SEQUENCE_ADD(&coreset0->tci_StatesPDCCH_ToAddList->list,tci[i]);
+  }
+  coreset0->tci_StatesPDCCH_ToReleaseList = NULL;
+  coreset0->tci_PresentInDCI = NULL;
+  coreset0->pdcch_DMRS_ScramblingID = NULL;
+
+}
+
+void fill_default_searchSpaceZero(NR_SearchSpace_t *ss0) {
+
+  if(ss0->controlResourceSetId == NULL) ss0->controlResourceSetId=calloc(1,sizeof(*ss0->controlResourceSetId));
+  if(ss0->monitoringSymbolsWithinSlot == NULL) ss0->monitoringSymbolsWithinSlot = calloc(1,sizeof(*ss0->monitoringSymbolsWithinSlot));
+  if(ss0->monitoringSymbolsWithinSlot->buf == NULL) ss0->monitoringSymbolsWithinSlot->buf = calloc(1,2);
+  if(ss0->nrofCandidates == NULL) ss0->nrofCandidates = calloc(1,sizeof(*ss0->nrofCandidates));
+  if(ss0->searchSpaceType == NULL) ss0->searchSpaceType = calloc(1,sizeof(*ss0->searchSpaceType));
+  if(ss0->searchSpaceType->choice.common == NULL) ss0->searchSpaceType->choice.common=calloc(1,sizeof(*ss0->searchSpaceType->choice.common));
+  if(ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 == NULL) ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 = calloc(1,sizeof(*ss0->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0));
+
+  ss0->searchSpaceId = 0;
+  *ss0->controlResourceSetId = 0;
+  ss0->monitoringSlotPeriodicityAndOffset = calloc(1,sizeof(*ss0->monitoringSlotPeriodicityAndOffset));
+  ss0->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+  ss0->duration=NULL;
+
+  // should be '1100 0000 0000 00'B (LSB first!), first two symols in slot, adjust if needed
+  ss0->monitoringSymbolsWithinSlot->buf[1] = 0;
+  ss0->monitoringSymbolsWithinSlot->buf[0] = (1<<7) | (1<<6);
+  ss0->monitoringSymbolsWithinSlot->size = 2;
+  ss0->monitoringSymbolsWithinSlot->bits_unused = 2;
+
+  ss0->nrofCandidates->aggregationLevel1 = NR_SearchSpace__nrofCandidates__aggregationLevel1_n0;
+  ss0->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n0;
+  ss0->nrofCandidates->aggregationLevel4 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n1;
+  ss0->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
+  ss0->nrofCandidates->aggregationLevel16 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;
+
+  ss0->searchSpaceType->present = NR_SearchSpace__searchSpaceType_PR_common;
+}
 
 void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
                                      NR_CellGroupConfig_t *secondaryCellGroup,
@@ -468,35 +533,38 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList=NULL;
  bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList=calloc(1,sizeof(*bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList));
 
- NR_SearchSpace_t *ss=calloc(1,sizeof(*ss));
- ss->searchSpaceId = 1;
- ss->controlResourceSetId=calloc(1,sizeof(*ss->controlResourceSetId));
- *ss->controlResourceSetId=1;
- ss->monitoringSlotPeriodicityAndOffset = calloc(1,sizeof(*ss->monitoringSlotPeriodicityAndOffset));
- ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
- ss->duration=NULL; 
- ss->monitoringSymbolsWithinSlot = calloc(1,sizeof(*ss->monitoringSymbolsWithinSlot));
- ss->monitoringSymbolsWithinSlot->buf = calloc(1,2);
- // should be '1100 0000 0000 00'B (LSB first!), first two symols in slot, adjust if needed
- ss->monitoringSymbolsWithinSlot->buf[1] = 0;
- ss->monitoringSymbolsWithinSlot->buf[0] = (1<<7) | (1<<6);
- ss->monitoringSymbolsWithinSlot->size = 2;
- ss->monitoringSymbolsWithinSlot->bits_unused = 2;
- ss->nrofCandidates = calloc(1,sizeof(*ss->nrofCandidates));
- ss->nrofCandidates->aggregationLevel1 = NR_SearchSpace__nrofCandidates__aggregationLevel1_n0;
- ss->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n0;
- ss->nrofCandidates->aggregationLevel4 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n1;
- ss->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
- ss->nrofCandidates->aggregationLevel16 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;
- ss->searchSpaceType = calloc(1,sizeof(*ss->searchSpaceType));
- ss->searchSpaceType->present = NR_SearchSpace__searchSpaceType_PR_common;
- ss->searchSpaceType->choice.common=calloc(1,sizeof(*ss->searchSpaceType->choice.common));
- ss->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 = calloc(1,sizeof(*ss->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0));
 
- ASN_SEQUENCE_ADD(&bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList->list,ss);
- 
 
- bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=NULL;
+  NR_SearchSpace_t *ss=calloc(1,sizeof(*ss));
+  ss->searchSpaceId = 1;
+  ss->controlResourceSetId=calloc(1,sizeof(*ss->controlResourceSetId));
+  *ss->controlResourceSetId=1;
+  ss->monitoringSlotPeriodicityAndOffset = calloc(1,sizeof(*ss->monitoringSlotPeriodicityAndOffset));
+  ss->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+  ss->duration=NULL;
+  ss->monitoringSymbolsWithinSlot = calloc(1,sizeof(*ss->monitoringSymbolsWithinSlot));
+  ss->monitoringSymbolsWithinSlot->buf = calloc(1,2);
+  // should be '1100 0000 0000 00'B (LSB first!), first two symols in slot, adjust if needed
+  ss->monitoringSymbolsWithinSlot->buf[1] = 0;
+  ss->monitoringSymbolsWithinSlot->buf[0] = (1<<7) | (1<<6);
+  ss->monitoringSymbolsWithinSlot->size = 2;
+  ss->monitoringSymbolsWithinSlot->bits_unused = 2;
+  ss->nrofCandidates = calloc(1,sizeof(*ss->nrofCandidates));
+  ss->nrofCandidates->aggregationLevel1 = NR_SearchSpace__nrofCandidates__aggregationLevel1_n0;
+  ss->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n0;
+  ss->nrofCandidates->aggregationLevel4 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n1;
+  ss->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
+  ss->nrofCandidates->aggregationLevel16 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;
+  ss->searchSpaceType = calloc(1,sizeof(*ss->searchSpaceType));
+  ss->searchSpaceType->present = NR_SearchSpace__searchSpaceType_PR_common;
+  ss->searchSpaceType->choice.common=calloc(1,sizeof(*ss->searchSpaceType->choice.common));
+  ss->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 = calloc(1,sizeof(*ss->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0));
+
+  ASN_SEQUENCE_ADD(&bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList->list,ss);
+
+
+ bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=calloc(1,sizeof(*bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1));
+ *bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceSIB1=0;
  bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceOtherSystemInformation=NULL;
  bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->pagingSearchSpace=NULL;
  bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->ra_SearchSpace=calloc(1,sizeof(*bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->ra_SearchSpace));