diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
index 1c1ac64672..577a7ab67a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
@@ -422,7 +422,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   // TODO
 
   // Schedule CSI-RS transmission
-  //nr_csirs_scheduling(module_idP, UE_id, frame, slot, slots_per_frame[*scc->ssbSubcarrierSpacing]);
+  nr_csirs_scheduling(module_idP, frame, slot, nr_slots_per_frame[*scc->ssbSubcarrierSpacing]);
 
   // Schedule CSI measurement reporting: check in slot 0 for the whole frame
   if (slot == 0)
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 5abae7486b..44834edbba 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -1803,147 +1803,152 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
 
 
 void nr_csirs_scheduling(int Mod_idP,
-                         int UE_id,
                          frame_t frame,
                          sub_frame_t slot,
                          int n_slots_frame){
 
   int CC_id = 0;
   NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
-  NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
-  NR_CellGroupConfig_t *secondaryCellGroup = UE_info->secondaryCellGroup[UE_id];
-  NR_CSI_MeasConfig_t *csi_measconfig = secondaryCellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup;
-  NR_NZP_CSI_RS_Resource_t *nzpcsi;
-  int period, offset;
+  NR_list_t *UE_list = &UE_info->list;
   gNB_MAC_INST *gNB_mac = RC.nrmac[Mod_idP];
-  uint8_t *vrb_map = RC.nrmac[Mod_idP]->common_channels[CC_id].vrb_map;
-  nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
-  NR_BWP_Downlink_t *bwp=secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[sched_ctrl->active_bwp->bwp_Id-1];
+  uint16_t *vrb_map = gNB_mac->common_channels[CC_id].vrb_map;
 
-  AssertFatal(csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count>0,"NO CSI report configuration available");
+  for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
 
-  for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){
-    nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id];
-    NR_CSI_RS_ResourceMapping_t  resourceMapping = nzpcsi->resourceMapping;
-    csi_period_offset(NULL,nzpcsi,&period,&offset);
+    NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+    NR_CellGroupConfig_t *secondaryCellGroup = UE_info->secondaryCellGroup[UE_id];
+    NR_CSI_MeasConfig_t *csi_measconfig = secondaryCellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup;
+    NR_NZP_CSI_RS_Resource_t *nzpcsi;
+    int period, offset;
 
-    if((frame*n_slots_frame+slot-offset)%period == 0) {
+    nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
+    NR_BWP_Downlink_t *bwp=secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[sched_ctrl->active_bwp->bwp_Id-1];
 
-      LOG_I(MAC,"Scheduling CSI-RS in frame %d slot %d\n",frame,slot);
+    AssertFatal(csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count>0,"NO CSI report configuration available");
 
-      nfapi_nr_dl_tti_request_pdu_t *dl_tti_csirs_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
-      memset((void*)dl_tti_csirs_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
-      dl_tti_csirs_pdu->PDUType = NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE;
-      dl_tti_csirs_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_csi_rs_pdu));
+    for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){
+      nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id];
+      NR_CSI_RS_ResourceMapping_t  resourceMapping = nzpcsi->resourceMapping;
+      csi_period_offset(NULL,nzpcsi,&period,&offset);
 
-      nfapi_nr_dl_tti_csi_rs_pdu_rel15_t *csirs_pdu_rel15 = &dl_tti_csirs_pdu->csi_rs_pdu.csi_rs_pdu_rel15;
+      if((frame*n_slots_frame+slot-offset)%period == 0) {
 
-      csirs_pdu_rel15->bwp_size  = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
-      csirs_pdu_rel15->bwp_start = NRRIV2PRBOFFSET(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
-      csirs_pdu_rel15->subcarrier_spacing = bwp->bwp_Common->genericParameters.subcarrierSpacing;
-      if (bwp->bwp_Common->genericParameters.cyclicPrefix)
-        csirs_pdu_rel15->cyclic_prefix = *bwp->bwp_Common->genericParameters.cyclicPrefix;
-      else
-        csirs_pdu_rel15->cyclic_prefix = 0;
+        LOG_I(MAC,"Scheduling CSI-RS in frame %d slot %d\n",frame,slot);
 
-      csirs_pdu_rel15->start_rb = resourceMapping.freqBand.startingRB;
-      csirs_pdu_rel15->nr_of_rbs = resourceMapping.freqBand.nrofRBs;
-      csirs_pdu_rel15->csi_type = 1; // NZP-CSI-RS
-      csirs_pdu_rel15->symb_l0 = resourceMapping.firstOFDMSymbolInTimeDomain;
-      if (resourceMapping.firstOFDMSymbolInTimeDomain2)
-        csirs_pdu_rel15->symb_l1 = *resourceMapping.firstOFDMSymbolInTimeDomain2;
-      csirs_pdu_rel15->cdm_type = resourceMapping.cdm_Type;
-      csirs_pdu_rel15->freq_density = resourceMapping.density.present;
-      if ((resourceMapping.density.present == NR_CSI_RS_ResourceMapping__density_PR_dot5)
-          && (resourceMapping.density.choice.dot5 == NR_CSI_RS_ResourceMapping__density__dot5_evenPRBs))
-        csirs_pdu_rel15->freq_density--;
-      csirs_pdu_rel15->scramb_id = nzpcsi->scramblingID;
-      csirs_pdu_rel15->power_control_offset = nzpcsi->powerControlOffset + 8;
-      if (nzpcsi->powerControlOffsetSS)
-        csirs_pdu_rel15->power_control_offset_ss = *nzpcsi->powerControlOffsetSS;
-      else
-        csirs_pdu_rel15->power_control_offset_ss = 1; // 0 dB
-      switch(resourceMapping.frequencyDomainAllocation.present){
-        case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row1:
-          csirs_pdu_rel15->row = 1;
-          csirs_pdu_rel15->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0])>>4)&0x0f;
-          break;
-        case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row2:
-          csirs_pdu_rel15->row = 2;
-          csirs_pdu_rel15->freq_domain = (((resourceMapping.frequencyDomainAllocation.choice.row1.buf[1]>>4)&0x0f) |
-                                         ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0]<<8)&0xf0));
-          break;
-        case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row4:
-          csirs_pdu_rel15->row = 4;
-          csirs_pdu_rel15->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0])>>5)&0x0f;
-          break;
-        case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_other:
-          csirs_pdu_rel15->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0])>>2)&0x0f;
-          // determining the row of table 7.4.1.5.3-1 in 38.211
-          switch(resourceMapping.nrofPorts){
-            case NR_CSI_RS_ResourceMapping__nrofPorts_p1:
-              break;
-            case NR_CSI_RS_ResourceMapping__nrofPorts_p2:
-              csirs_pdu_rel15->row = 3;
-              break;
-            case NR_CSI_RS_ResourceMapping__nrofPorts_p4:
-              csirs_pdu_rel15->row = 5;
-              break;
-            case NR_CSI_RS_ResourceMapping__nrofPorts_p8:
-              if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
-                csirs_pdu_rel15->row = 8;
-              else{
-                int num_k = 0;
-                for (int k=0; k<6; k++)
-                  num_k+=(((csirs_pdu_rel15->freq_domain)>>k)&0x01);
-                if(num_k==4)
-                  csirs_pdu_rel15->row = 6;
+        nfapi_nr_dl_tti_request_pdu_t *dl_tti_csirs_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
+        memset((void*)dl_tti_csirs_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
+        dl_tti_csirs_pdu->PDUType = NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE;
+        dl_tti_csirs_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_csi_rs_pdu));
+
+        nfapi_nr_dl_tti_csi_rs_pdu_rel15_t *csirs_pdu_rel15 = &dl_tti_csirs_pdu->csi_rs_pdu.csi_rs_pdu_rel15;
+
+        csirs_pdu_rel15->bwp_size  = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
+        csirs_pdu_rel15->bwp_start = NRRIV2PRBOFFSET(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
+        csirs_pdu_rel15->subcarrier_spacing = bwp->bwp_Common->genericParameters.subcarrierSpacing;
+        if (bwp->bwp_Common->genericParameters.cyclicPrefix)
+          csirs_pdu_rel15->cyclic_prefix = *bwp->bwp_Common->genericParameters.cyclicPrefix;
+        else
+          csirs_pdu_rel15->cyclic_prefix = 0;
+
+        csirs_pdu_rel15->start_rb = resourceMapping.freqBand.startingRB;
+        csirs_pdu_rel15->nr_of_rbs = resourceMapping.freqBand.nrofRBs;
+        csirs_pdu_rel15->csi_type = 1; // NZP-CSI-RS
+        csirs_pdu_rel15->symb_l0 = resourceMapping.firstOFDMSymbolInTimeDomain;
+        if (resourceMapping.firstOFDMSymbolInTimeDomain2)
+          csirs_pdu_rel15->symb_l1 = *resourceMapping.firstOFDMSymbolInTimeDomain2;
+        csirs_pdu_rel15->cdm_type = resourceMapping.cdm_Type;
+        csirs_pdu_rel15->freq_density = resourceMapping.density.present;
+        if ((resourceMapping.density.present == NR_CSI_RS_ResourceMapping__density_PR_dot5)
+            && (resourceMapping.density.choice.dot5 == NR_CSI_RS_ResourceMapping__density__dot5_evenPRBs))
+          csirs_pdu_rel15->freq_density--;
+        csirs_pdu_rel15->scramb_id = nzpcsi->scramblingID;
+        csirs_pdu_rel15->power_control_offset = nzpcsi->powerControlOffset + 8;
+        if (nzpcsi->powerControlOffsetSS)
+          csirs_pdu_rel15->power_control_offset_ss = *nzpcsi->powerControlOffsetSS;
+        else
+          csirs_pdu_rel15->power_control_offset_ss = 1; // 0 dB
+        switch(resourceMapping.frequencyDomainAllocation.present){
+          case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row1:
+            csirs_pdu_rel15->row = 1;
+            csirs_pdu_rel15->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0])>>4)&0x0f;
+            break;
+          case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row2:
+            csirs_pdu_rel15->row = 2;
+            csirs_pdu_rel15->freq_domain = (((resourceMapping.frequencyDomainAllocation.choice.row1.buf[1]>>4)&0x0f) |
+                                           ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0]<<8)&0xf0));
+            break;
+          case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row4:
+            csirs_pdu_rel15->row = 4;
+            csirs_pdu_rel15->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0])>>5)&0x0f;
+            break;
+          case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_other:
+            csirs_pdu_rel15->freq_domain = ((resourceMapping.frequencyDomainAllocation.choice.row1.buf[0])>>2)&0x0f;
+            // determining the row of table 7.4.1.5.3-1 in 38.211
+            switch(resourceMapping.nrofPorts){
+              case NR_CSI_RS_ResourceMapping__nrofPorts_p1:
+                break;
+              case NR_CSI_RS_ResourceMapping__nrofPorts_p2:
+                csirs_pdu_rel15->row = 3;
+                break;
+              case NR_CSI_RS_ResourceMapping__nrofPorts_p4:
+                csirs_pdu_rel15->row = 5;
+                break;
+              case NR_CSI_RS_ResourceMapping__nrofPorts_p8:
+                if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+                  csirs_pdu_rel15->row = 8;
+                else{
+                  int num_k = 0;
+                  for (int k=0; k<6; k++)
+                    num_k+=(((csirs_pdu_rel15->freq_domain)>>k)&0x01);
+                  if(num_k==4)
+                    csirs_pdu_rel15->row = 6;
+                  else
+                    csirs_pdu_rel15->row = 7;
+                }
+                break;
+              case NR_CSI_RS_ResourceMapping__nrofPorts_p12:
+                if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+                  csirs_pdu_rel15->row = 10;
                 else
-                  csirs_pdu_rel15->row = 7;
-              }
-              break;
-            case NR_CSI_RS_ResourceMapping__nrofPorts_p12:
-              if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
-                csirs_pdu_rel15->row = 10;
-              else
-                csirs_pdu_rel15->row = 9;
-              break;
-            case NR_CSI_RS_ResourceMapping__nrofPorts_p16:
-              if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
-                csirs_pdu_rel15->row = 12;
-              else
-                csirs_pdu_rel15->row = 11;
-              break;
-            case NR_CSI_RS_ResourceMapping__nrofPorts_p24:
-              if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
-                csirs_pdu_rel15->row = 14;
-              else{
-                if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm8_FD2_TD4)
-                  csirs_pdu_rel15->row = 15;
+                  csirs_pdu_rel15->row = 9;
+                break;
+              case NR_CSI_RS_ResourceMapping__nrofPorts_p16:
+                if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+                  csirs_pdu_rel15->row = 12;
                 else
-                  csirs_pdu_rel15->row = 13;
-              }
-              break;
-            case NR_CSI_RS_ResourceMapping__nrofPorts_p32:
-              if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
-                csirs_pdu_rel15->row = 17;
-              else{
-                if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm8_FD2_TD4)
-                  csirs_pdu_rel15->row = 18;
-                else
-                  csirs_pdu_rel15->row = 16;
-              }
-              break;
-          default:
-            AssertFatal(1==0,"Invalid number of ports in CSI-RS resource\n");
-          }
-          break;
-      default:
-        AssertFatal(1==0,"Invalid freqency domain allocation in CSI-RS resource\n");
+                  csirs_pdu_rel15->row = 11;
+                break;
+              case NR_CSI_RS_ResourceMapping__nrofPorts_p24:
+                if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+                  csirs_pdu_rel15->row = 14;
+                else{
+                  if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm8_FD2_TD4)
+                    csirs_pdu_rel15->row = 15;
+                  else
+                    csirs_pdu_rel15->row = 13;
+                }
+                break;
+              case NR_CSI_RS_ResourceMapping__nrofPorts_p32:
+                if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm4_FD2_TD2)
+                  csirs_pdu_rel15->row = 17;
+                else{
+                  if (resourceMapping.cdm_Type == NR_CSI_RS_ResourceMapping__cdm_Type_cdm8_FD2_TD4)
+                    csirs_pdu_rel15->row = 18;
+                  else
+                    csirs_pdu_rel15->row = 16;
+                }
+                break;
+            default:
+              AssertFatal(1==0,"Invalid number of ports in CSI-RS resource\n");
+            }
+            break;
+        default:
+          AssertFatal(1==0,"Invalid freqency domain allocation in CSI-RS resource\n");
+        }
+        dl_req->nPDUs++;
+        for (int rb = csirs_pdu_rel15->start_rb; rb < csirs_pdu_rel15->nr_of_rbs; rb++)
+          vrb_map[rb] = 1;
       }
-      dl_req->nPDUs++;
-      for (int rb = csirs_pdu_rel15->start_rb; rb < csirs_pdu_rel15->nr_of_rbs; rb++)
-        vrb_map[rb] = 1;
     }
   }
 }
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index 046ab9a9e4..8aa70a5a0b 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -183,7 +183,6 @@ void nr_schedule_pucch(int Mod_idP,
                        sub_frame_t slotP);
 
 void nr_csirs_scheduling(int Mod_idP,
-                         int UE_id,
                          frame_t frame,
                          sub_frame_t slot,
                          int n_slots_frame);