}
 
                        /* Write one 16-byte chunk of data to the Dataflash */
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
-                       Dataflash_SendByte(Endpoint_Read_Byte());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
+                       Dataflash_SendByte(Endpoint_Read_8());
 
                        /* Increment the Dataflash page 16 byte block counter */
                        CurrDFPageByteDiv16++;
                          return;
                }
 
-               /* Decrement the blocks remaining counter and reset the sub block counter */
+               /* Decrement the blocks remaining counter */
                TotalBlocks--;
        }
 
                        }
 
                        /* Read one 16-byte chunk of data from the Dataflash */
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
-                       Endpoint_Write_Byte(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
+                       Endpoint_Write_8(Dataflash_ReceiveByte());
 
                        /* Increment the Dataflash page 16 byte block counter */
                        CurrDFPageByteDiv16++;
                        BytesInBlockDiv16++;
                }
 
-               /* Decrement the blocks remaining counter and reset the sub block counter */
+               /* Decrement the blocks remaining counter */
                TotalBlocks--;
        }