diff --git a/draft-ietf-sidrops-8210bis.xml b/draft-ietf-sidrops-8210bis.xml
index 156dea6..782cb50 100644
--- a/draft-ietf-sidrops-8210bis.xml
+++ b/draft-ietf-sidrops-8210bis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 
-<!DOCTYPE rfc SYSTEM "rfc2629.dtd">
+<!-- <!DOCTYPE rfc SYSTEM "rfc2629.dtd"> -->
 
 <?rfc sortrefs="yes"?>
 <?rfc subcompact="no"?>
@@ -10,7 +10,7 @@
 <?rfc compact="yes"?>
 <?rfc subcompact="no"?>
 
-<rfc category="std" docName="draft-ietf-sidrops-8210bis-05" obsoletes="8210" ipr="trust200902" consensus="yes">
+<rfc category="std" docName="draft-ietf-sidrops-8210bis-06" submissionType="IETF" obsoletes="8210" ipr="trust200902" consensus="yes">
 
   <front>
 
@@ -158,7 +158,7 @@
           </t>
           <t hangText="Serial Number:">
             "Serial Number" is a
-            32&nbhy;bit strictly increasing unsigned integer which wraps
+            32-bit strictly increasing unsigned integer which wraps
             from 2^32-1 to 0.  It denotes the logical version of a
             cache.  A cache increments the value when it successfully
             updates its data from a parent cache or from primary RPKI
@@ -385,22 +385,35 @@
               header which includes the length field.
             </t>
             <t hangText="Flags:">
-              The lowest-order bit of the Flags field is 1 for an
-              announcement and 0 for a withdrawal.  For a Prefix PDU
-              (IPv4 or IPv6), the flag indicates whether this PDU
-              announces a new right to announce the prefix or
-              withdraws a previously announced right; a withdraw
-              effectively deletes one previously announced Prefix PDU
-              with the exact same Prefix, Length, Max-Len, and
-              Autonomous System Number (ASN).  Similarly, for a Router
-              Key PDU, the flag indicates whether this PDU announces a
-              new Router Key or deletes one previously announced
-              Router Key PDU with the exact same AS Number,
-              subjectKeyIdentifier, and subjectPublicKeyInfo.
-            </t>
+              The lowest-order bit of the Flags field is 0 for IPv4 and
+              1 for IPv6.</t>
+
+	      <t>The next lowest bit is 1 for an announcement and 0 for
+	      a withdrawal.  For a Prefix PDU (IPv4 or IPv6), the
+	      announce/withdraw flag indicates whether this PDU
+	      announces a new right to announce the prefix or withdraws
+	      a previously announced right; a withdraw effectively
+	      deletes one previously announced Prefix PDU with the exact
+	      same Prefix, Length, Max-Len, and Autonomous System Number
+	      (ASN).  </t>
+
+	      <t>Similarly, for a Router Key PDU, the flag indicates
+	      whether this PDU announces a new Router Key or deletes one
+	      previously announced Router Key PDU with the exact same AS
+	      Number, subjectKeyIdentifier, and
+	      subjectPublicKeyInfo.</t>
+	      
+	      <t>For the ASPA PDU, the announce/withdraw Flag is set to
+	      1 to indicate either the announcement of a new ASPA record
+	      or a replacement for a previously announced record with
+	      the same Customer Autonomous System Number.  The
+	      announce/withdraw flag set to 0 indicates removal of the
+	      ASPA record in total.  Here, only the customer AS of the
+	      ASPA record MUST be provided, the Provider AS Count as
+	      well as the Provider AS Numbers list MUST BE zero.</t>
             <t>
               The remaining bits in the Flags field are reserved for
-              future use.  In protocol version 1, they MUST be zero on
+              future use.  In protocol version 2, they MUST be zero on
               transmission and MUST be ignored on receipt.
             </t>
             <t hangText="Prefix Length:">
@@ -526,7 +539,7 @@
         </t>
         <t>
           The rationale for this approach is that the entire purpose of
-          the RPKI&nbhy;Router protocol is to offload work from the router
+          the RPKI-Router protocol is to offload work from the router
           to the cache, and it should therefore be the cache's job to
           simplify the change set, thus reducing work for the router.
         </t>
@@ -1267,7 +1280,7 @@ Cache                         Router
           Serial Number when the cache's serial changes, with the
           expectation that the router MAY then issue a Serial Query
           earlier than it otherwise might.  This is analogous to DNS
-          NOTIFY in <xref target="RFC1996"/>.  The cache MUST rate&nbhy;limit
+          NOTIFY in <xref target="RFC1996"/>.  The cache MUST rate-limit
           Serial Notifies to no more frequently than one per minute.
         </t>
         <t>