diff --git a/openair1/PHY/CODING/nr_rate_matching.c b/openair1/PHY/CODING/nr_rate_matching.c
index f7b54f6eae..9d50b4678b 100644
--- a/openair1/PHY/CODING/nr_rate_matching.c
+++ b/openair1/PHY/CODING/nr_rate_matching.c
@@ -74,7 +74,7 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
                           uint8_t rvidx,
                           uint32_t E)
 {
-  uint32_t Ncb,k0,j,k,Nref,N,ind;
+  uint32_t Ncb,ind,k,Nref,N;
 
   if (C==0) {
     printf("nr_rate_matching: invalid parameters (C %d\n",C);
@@ -91,25 +91,18 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
       Ncb = min(N, Nref);
   }
 
-  k0 = (index_k0[BG-1][rvidx]*Ncb/N)*Z;
+  ind = (index_k0[BG-1][rvidx]*Ncb/N)*Z;
 
 #ifdef RM_DEBUG
   printf("nr_rate_matching_ldpc: E %d, k0 %d, Ncb %d, rvidx %d\n", E, ind, Ncb, rvidx);
 #endif
 
   k=0;
-  j=0;
 
-  while(k<E) {
-    ind=(k0+j)%Ncb;
-    if (w[ind] != NR_NULL) e[k++]=w[ind];
-    j++;
-  }  
-
-  /*for (; (ind<Ncb)&&(k<E); ind++) {
+  for (; (ind<Ncb)&&(k<E); ind++) {
 
 #ifdef RM_DEBUG
-    printf("RM_TX k%d Ind: %d (%d)\t",k,ind,w[ind]);
+    printf("RM_TX k%d Ind: %d (%d)\n",k,ind,w[ind]);
 #endif
 
     if (w[ind] != NR_NULL) e[k++]=w[ind];
@@ -119,12 +112,12 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
     for (ind=0; (ind<Ncb)&&(k<E); ind++) {
 
 #ifdef RM_DEBUG
-      printf("RM_TX k%d Ind: %d (%d)\t",k,ind,w[ind]);
+      printf("RM_TX k%d Ind: %d (%d)\n",k,ind,w[ind]);
 #endif
 
       if (w[ind] != NR_NULL) e[k++]=w[ind];
     }
-  }*/
+  }
 
 
   return 0;
@@ -213,3 +206,4 @@ int nr_rate_matching_ldpc_rx(uint8_t Ilbrm,
 
   return 0;
 }
+
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index f504832442..db7dcd625a 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -326,32 +326,47 @@ int nr_dlsch_encoding(unsigned char *a,int frame,
       printf("%02x.",a[i]);
     printf("\n");
     */
-    // Add 24-bit crc (polynomial A) to payload
-    crc = crc24a(a,A)>>8;
-    a[A>>3] = ((uint8_t*)&crc)[2];
-    a[1+(A>>3)] = ((uint8_t*)&crc)[1];
-    a[2+(A>>3)] = ((uint8_t*)&crc)[0];
-    //printf("CRC %x (A %d)\n",crc,A);
-    //printf("a0 %d a1 %d a2 %d\n", a[A>>3], a[1+(A>>3)], a[2+(A>>3)]);
 
-    dlsch->harq_processes[harq_pid]->B = A+24;
-    //    dlsch->harq_processes[harq_pid]->b = a;
+    if (A > 3824) {
+      // Add 24-bit crc (polynomial A) to payload
+      crc = crc24a(a,A)>>8;
+      a[A>>3] = ((uint8_t*)&crc)[2];
+      a[1+(A>>3)] = ((uint8_t*)&crc)[1];
+      a[2+(A>>3)] = ((uint8_t*)&crc)[0];
+      //printf("CRC %x (A %d)\n",crc,A);
+      //printf("a0 %d a1 %d a2 %d\n", a[A>>3], a[1+(A>>3)], a[2+(A>>3)]);
+  
+      dlsch->harq_processes[harq_pid]->B = A+24;
+      //    dlsch->harq_processes[harq_pid]->b = a;
    
-    AssertFatal((A/8)+4 <= MAX_DLSCH_PAYLOAD_BYTES,"A %d is too big (A/8+4 = %d > %d)\n",A,(A/8)+4,MAX_DLSCH_PAYLOAD_BYTES);
+      AssertFatal((A/8)+4 <= MAX_DLSCH_PAYLOAD_BYTES,"A %d is too big (A/8+4 = %d > %d)\n",A,(A/8)+4,MAX_DLSCH_PAYLOAD_BYTES);
 
-    memcpy(dlsch->harq_processes[harq_pid]->b,a,(A/8)+4);
+      memcpy(dlsch->harq_processes[harq_pid]->b,a,(A/8)+4);  // why is this +4 if the CRC is only 3 bytes?
+    }
+    else {
+      // Add 16-bit crc (polynomial A) to payload
+      crc = crc16(a,A)>>16;
+      a[A>>3] = ((uint8_t*)&crc)[1];
+      a[1+(A>>3)] = ((uint8_t*)&crc)[0];
+      //printf("CRC %x (A %d)\n",crc,A);
+      //printf("a0 %d a1 %d \n", a[A>>3], a[1+(A>>3)]);
+  
+      dlsch->harq_processes[harq_pid]->B = A+16;
+      //    dlsch->harq_processes[harq_pid]->b = a;
+   
+      AssertFatal((A/8)+3 <= MAX_DLSCH_PAYLOAD_BYTES,"A %d is too big (A/8+3 = %d > %d)\n",A,(A/8)+3,MAX_DLSCH_PAYLOAD_BYTES);
 
+      memcpy(dlsch->harq_processes[harq_pid]->b,a,(A/8)+3);  // using 3 bytes to mimic the case of 24 bit crc
+    }
     if (R<1000)
       Coderate = (float) R /(float) 1024;
     else  // to scale for mcs 20 and 26 in table 5.1.3.1-2 which are decimal and input 2* in nr_tbs_tools
       Coderate = (float) R /(float) 2048;
 
-    if ((A <=292) || ((A<=3824) && (Coderate <= 0.6667)) || Coderate <= 0.25){
+    if ((A <=292) || ((A<=3824) && (Coderate <= 0.6667)) || Coderate <= 0.25)
 		BG = 2;
-	}
-	else{
+    else
 		BG = 1;
-	}
 
     nr_segmentation(dlsch->harq_processes[harq_pid]->b,
 		    dlsch->harq_processes[harq_pid]->c,