diff --git a/meddfnprs.rpgle b/meddfnprs.rpgle
index 05ba48b..40f6536 100644
--- a/meddfnprs.rpgle
+++ b/meddfnprs.rpgle
@@ -31,16 +31,14 @@ dcl-pr MD_ParseRetrieveBuffer;
 
 end-pr;
 
-
-
 //=====================================================================
 //
 // MD_ParseRetrieveBuffer
 //
-// Parses a retrieved MEDDFN buffer.
+// Parses a retrieved TAPE0200 buffer.
 //
-// Currently supported:
-//    TAPE0200 header
+// Currently:
+//    - TAPE0200 header
 //
 //=====================================================================
 
@@ -58,12 +56,8 @@ dcl-proc MD_ParseRetrieveBuffer;
    end-pi;
 
 
-   dcl-ds HeaderBuffer
-      char(%size(MD_Tape0200Header_T));
-
    dcl-ds Header
-      likeds(MD_Tape0200Header_T)
-      overlay(HeaderBuffer);
+      likeds(MD_Tape0200Header_T);
 
 
    //---------------------------------------------------------------
@@ -77,11 +71,11 @@ dcl-proc MD_ParseRetrieveBuffer;
    // Copy TAPE0200 header
    //---------------------------------------------------------------
 
-   HeaderBuffer =
+   Header =
       %subst(
          ReceiverBuffer :
          1 :
-         %size(MD_Tape0200Header_T));
+         %size(Header));
 
 
    //---------------------------------------------------------------
@@ -103,6 +97,7 @@ dcl-proc MD_ParseRetrieveBuffer;
    MediaDefinition.SaveFormat =
       Header.SaveFormat;
 
+
 end-proc;