diff --git a/openair1/PHY/INIT/nr_parms.c b/openair1/PHY/INIT/nr_parms.c
index f37883b388..273bfbfe1a 100644
--- a/openair1/PHY/INIT/nr_parms.c
+++ b/openair1/PHY/INIT/nr_parms.c
@@ -46,7 +46,10 @@ int nr_init_frame_parms0(NR_DL_FRAME_PARMS *fp,
   fp->numerology_index = mu;
   fp->Ncp = Ncp;
   fp->N_RB_DL = N_RB_DL;
+  fp->L_ssb = 8; // TODO get the number of SSB value from higher layers (and config file finally)
+  fp->ssb_type = nr_ssb_type_B; // TODO get the type from higher layers (and config file finally)
   
+
   switch(mu) {
 
     case NR_MU_0: //15kHz scs
diff --git a/openair1/PHY/NR_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
index 2e2c99f106..3b81aae04e 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
@@ -443,6 +443,5 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
         k-=frame_parms->ofdm_symbol_size;
     }
 
-
   return 0;
 }
diff --git a/openair1/PHY/NR_TRANSPORT/nr_pss.c b/openair1/PHY/NR_TRANSPORT/nr_pss.c
index 29dbe4ec99..e0d7b6ae33 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_pss.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pss.c
@@ -59,7 +59,6 @@ int nr_generate_pss(  int16_t *d_pss,
   /// Resource mapping
   a = amp;
 
-
     // PSS occupies a predefined position (subcarriers 56-182, symbol 0) within the SSB block starting from
     k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + 56; //and
     if (k>= frame_parms->ofdm_symbol_size) k-=frame_parms->ofdm_symbol_size;
diff --git a/openair1/PHY/defs_nr_common.h b/openair1/PHY/defs_nr_common.h
index 58a8833b18..8f6f22f6a4 100644
--- a/openair1/PHY/defs_nr_common.h
+++ b/openair1/PHY/defs_nr_common.h
@@ -303,11 +303,13 @@ typedef struct NR_DL_FRAME_PARMS {
   /// TDD configuration
   uint16_t tdd_uplink_nr[2*NR_MAX_SLOTS_PER_FRAME]; /* this is a bitmap of symbol of each slot given for 2 frames */
 
-   //SSB related params
+  //SSB related params
   /// Start in Subcarrier index of the SSB block
   uint16_t ssb_start_subcarrier;
   /// SSB type
   nr_ssb_type_e ssb_type;
+  /// Number of SSB
+  uint8_t L_ssb;
   /// PBCH polar encoder params
   t_nrPolar_params pbch_polar_params;
 
@@ -317,5 +319,4 @@ typedef struct NR_DL_FRAME_PARMS {
 
 } NR_DL_FRAME_PARMS;
 
-
 #endif
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index a7f8ef6884..6827b082d1 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -76,28 +76,47 @@ int return_ssb_type(nfapi_config_request_t *cfg)
 
 }*/
 
+
 // First SSB starting symbol candidate is used and type B is chosen for 30kHz SCS
-int nr_get_ssb_start_symbol(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *fp)
+int nr_get_ssb_start_symbol(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *fp, uint8_t i_ssb)
 {
   int mu = cfg->subframe_config.numerology_index_mu.value;
   int symbol = 0;
+  uint8_t n, n_temp;
+  nr_ssb_type_e type = fp->ssb_type;
+  int case_AC[2] = {2,8};
+  int case_BD[4] = {4,8,16,20};
+  int case_E[8] = {8, 12, 16, 20, 32, 36, 40, 44};
+
 
   switch(mu) {
 
-  case NR_MU_0:
-    symbol = 2;
+  case NR_MU_0: // case A
+    n = i_ssb >> 1;
+    symbol = case_AC[i_ssb % 2] + 14*n;
     break;
 
-  case NR_MU_1: // case B
-    symbol = 4;
+  case NR_MU_1: 
+    if (type == 1){ // case B
+	n = i_ssb >> 2;
+    	symbol = case_BD[i_ssb % 4] + 28*n;
+    }
+    if (type == 2){ // case C
+	n = i_ssb >> 1;
+        symbol = case_AC[i_ssb % 2] + 14*n;
+    }
     break;
 
-  case NR_MU_3:
-    symbol = 4;
+  case NR_MU_3: // case D
+    n_temp = i_ssb >> 2; 
+    n = n_temp + (n_temp >> 2);
+    symbol = case_BD[i_ssb % 4] + 28*n;
     break;
 
-  case NR_MU_4:
-    symbol = 8;
+  case NR_MU_4:  // case E
+    n_temp = i_ssb >> 3; 
+    n = n_temp + (n_temp >> 2);
+    symbol = case_E[i_ssb % 8] + 56*n;
     break;
 
   default:
@@ -122,33 +141,46 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
   nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
   int **txdataF = gNB->common_vars.txdataF;
   uint8_t *pbch_pdu=&gNB->pbch_pdu[0];
-  int ss_slot = (cfg->sch_config.half_frame_index.value)? 10 : 0;
-  uint8_t Lmax, ssb_index=0, n_hf=0;
+  // to set a effective slot number between 0 to 9 in the half frame where the SSB is supposed to be
+  uint8_t Lmax, ssb_index, n_hf;
+  int ssb_start_symbol, rel_slot;
+
+  n_hf = cfg->sch_config.half_frame_index.value;
+  rel_slot = (n_hf)? (slot-10) : slot; 
+
+  Lmax = (fp->dl_CarrierFreq < 3e9)? 4:8;  // max number of ssb
+  
+  if (fp->L_ssb > Lmax)
+	AssertFatal(0==1, "Invalid number of SSB larger than %d \n", Lmax);
 
   LOG_D(PHY,"common_signal_procedures: frame %d, slot %d\n",frame,slot);
 
-  int ssb_start_symbol = nr_get_ssb_start_symbol(cfg, fp);
-  nr_set_ssb_first_subcarrier(cfg, fp);
-  Lmax = (fp->dl_CarrierFreq < 3e9)? 4:8;
-
-
-  if (slot == ss_slot)
+  if(rel_slot<10 && rel_slot>=0)
   {
-    // Current implementation is based on SSB in first half frame, first candidate
-    LOG_D(PHY,"SS TX: frame %d, slot %d, start_symbol %d\n",frame,slot, ssb_start_symbol);
+     for (int i=0; i<2; i++)  // max two SSB per frame
+     {
+	ssb_index = i + 2*rel_slot; // computing the ssb_index
+	if (ssb_index < (fp->L_ssb))  // generating the ssb only if the current ssb index is lower than number of SSB configured
+	{
+	  int ssb_start_symbol_abs = nr_get_ssb_start_symbol(cfg, fp, ssb_index); // computing the starting symbol for current ssb
+	  ssb_start_symbol = ssb_start_symbol_abs % 14;  // start symbol wrt slot
 
-    nr_generate_pss(gNB->d_pss, txdataF[0], AMP, ssb_start_symbol, cfg, fp);
-    nr_generate_sss(gNB->d_sss, txdataF[0], AMP, ssb_start_symbol, cfg, fp);
+	  nr_set_ssb_first_subcarrier(cfg, fp);
+	  
+    	  LOG_D(PHY,"SS TX: frame %d, slot %d, start_symbol %d\n",frame,slot, ssb_start_symbol);
 
-    if (!(frame&7)){
-      LOG_D(PHY,"%d.%d : pbch_configured %d\n",frame,slot,gNB->pbch_configured);
-      if (gNB->pbch_configured != 1)return;
-      gNB->pbch_configured = 0;
-    }
+    	  nr_generate_pss(gNB->d_pss, txdataF[0], AMP, ssb_start_symbol, cfg, fp);
+    	  nr_generate_sss(gNB->d_sss, txdataF[0], AMP, ssb_start_symbol, cfg, fp);
 
-    nr_generate_pbch_dmrs(gNB->nr_gold_pbch_dmrs[n_hf][ssb_index],txdataF[0], AMP, ssb_start_symbol, cfg, fp);
+    	  if (!(frame&7)){
+      		LOG_D(PHY,"%d.%d : pbch_configured %d\n",frame,slot,gNB->pbch_configured);
+	        if (gNB->pbch_configured != 1)return;
+	        gNB->pbch_configured = 0;
+    	  }
 
-    nr_generate_pbch(&gNB->pbch,
+	  nr_generate_pbch_dmrs(gNB->nr_gold_pbch_dmrs[n_hf][ssb_index],txdataF[0], AMP, ssb_start_symbol, cfg, fp);
+
+    	  nr_generate_pbch(&gNB->pbch,
                       gNB->nrPolar_params,
                       pbch_pdu,
                       gNB->nr_pbch_interleaver,
@@ -157,6 +189,8 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
                       ssb_start_symbol,
                       n_hf,Lmax,ssb_index,
                       frame, cfg, fp);
+	}
+     }
   }
 
 }