diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index fff79d0e4e..e92ebadd08 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -413,25 +413,67 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
 
     ///Layer Precoding and Antenna port mapping
     // tx_layers 1-8 are mapped on antenna ports 1000-1007
-    uint8_t pmi = 4;//hard coded, should be changed later from the upper layer
-
+    // The precoding info is supported by nfapi such as numPRGs, prgSize, and PMIdx
+    // The same precoding matrix is applied on prgSize RBs, Thus
+    //        pmi = PMIdx[rbidx/prgSize], rbidx =0,...,rbSize-1
+    // The Precoding matrix:
+    // The Codebook Type I and Type II are not supported yet.
+    // We adopt the precoding matrices of PUSCH for 4 layers.
+    uint8_t pmi;
     for (int ap=0; ap<frame_parms->nb_antennas_tx; ap++) {
-      char *W_prec = nr_W_1l_4p[pmi][ap];//Hard coded, should be changed later from the upper layer
+
       for (int l=rel15->StartSymbolIndex; l<rel15->StartSymbolIndex+rel15->NrOfSymbols; l++) {
         uint16_t k = start_sc;
 
-        for (int i=0; i<rel15->rbSize*NR_NB_SC_PER_RB; i++) {
-          int32_t re_offset = l*frame_parms->ofdm_symbol_size + k;
-          int32_t precodatatx_F = nr_layer_precoder(txdataF_precoding, W_prec, rel15->nrOfLayers, re_offset+txdataF_offset);
-          ((int16_t*)txdataF[ap])[(re_offset<<1) + (2*txdataF_offset)] = ((int16_t *) &precodatatx_F)[0];
-          ((int16_t*)txdataF[ap])[(re_offset<<1) + 1 + (2*txdataF_offset)] = ((int16_t *) &precodatatx_F)[1];
-#ifdef DEBUG_DLSCH_MAPPING
-          printf("antenna %d\t l %d \t k %d \t txdataF: %d %d\n",
-                 ap, l, k, ((int16_t*)txdataF[ap])[(re_offset<<1) + (2*txdataF_offset)],
-                 ((int16_t*)txdataF[ap])[(re_offset<<1) + 1 + (2*txdataF_offset)]);
-#endif
-          if (++k >= frame_parms->ofdm_symbol_size)
-            k -= frame_parms->ofdm_symbol_size;
+        for (int rb=0; rb<rel15->rbSize; rb++) {
+          //get pmi info
+          if (rel15->precodingAndBeamforming.prgSize > 0)
+            pmi = rel15->precodingAndBeamforming.PMIdx[(int)rb/rel15->precodingAndBeamforming.prgSize];
+          else
+            pmi = 0;//no precoding
+
+          //get the precoding matrix weights:
+          char *W_prec;
+          switch (frame_parms->nb_antennas_tx) {
+            case 1://1 antenna port
+              W_prec = nr_W_1l_2p[pmi][ap];
+              break;
+              case 2://2 antenna ports
+                if (rel15->nrOfLayers == 1)//1 layer
+                  W_prec = nr_W_1l_2p[pmi][ap];
+                else//2 layers
+                  W_prec = nr_W_2l_2p[pmi][ap];
+                break;
+                case 4://4 antenna ports
+                  if (rel15->nrOfLayers == 1)//1 layer
+                    W_prec = nr_W_1l_4p[pmi][ap];
+                  else if (rel15->nrOfLayers == 2)//2 layers
+                    W_prec = nr_W_2l_4p[pmi][ap];
+                  else if (rel15->nrOfLayers == 3)//3 layers
+                    W_prec = nr_W_3l_4p[pmi][ap];
+                  else//4 layers
+                    W_prec = nr_W_4l_4p[pmi][ap];
+                  break;
+                default:
+                  LOG_D(PHY,"Precoding 1,2, or 4 antenna ports are currently supported\n");
+                  W_prec = nr_W_1l_2p[pmi][ap];
+                  break;
+              }
+
+          for (int i=0; i<NR_NB_SC_PER_RB; i++) {
+            int32_t re_offset = l*frame_parms->ofdm_symbol_size + k;
+            int32_t precodatatx_F = nr_layer_precoder(txdataF_precoding, W_prec, rel15->nrOfLayers, re_offset+txdataF_offset);
+            ((int16_t*)txdataF[ap])[(re_offset<<1) + (2*txdataF_offset)] = ((int16_t *) &precodatatx_F)[0];
+            ((int16_t*)txdataF[ap])[(re_offset<<1) + 1 + (2*txdataF_offset)] = ((int16_t *) &precodatatx_F)[1];
+  #ifdef DEBUG_DLSCH_MAPPING
+            printf("antenna %d\t l %d \t k %d \t txdataF: %d %d\n",
+                   ap, l, k, ((int16_t*)txdataF[ap])[(re_offset<<1) + (2*txdataF_offset)],
+                   ((int16_t*)txdataF[ap])[(re_offset<<1) + 1 + (2*txdataF_offset)]);
+  #endif
+            if (++k >= frame_parms->ofdm_symbol_size) {
+              k -= frame_parms->ofdm_symbol_size;
+            }
+          }
         } //RE loop
       } // symbol loop
     }// port loop