diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..0385b71
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,6 @@
+# Version 0.8
+
+  * Started tracking in a CHANGELOG file
+  * Change Aaron's Address
+  * Address and find a compromise for issue #17
+
diff --git a/README.md b/README.md
index 1b086e2..da0dfeb 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,7 @@ Users and Use-cases
   * [CIRCL](https://www.circl.lu/services/passive-dns/)
   * [D4 Project Passive DNS](https://www.d4-project.org/2019/05/28/passive-dns-tutorial.html)
   * [balboa](https://github.com/DCSO/balboa)
-  * 360CN?
-  * ...
+  * ... add yours please. Create a pull request to this file please.
 
 
 
diff --git a/i-d/Makefile b/i-d/Makefile
index 9462162..9f2503b 100644
--- a/i-d/Makefile
+++ b/i-d/Makefile
@@ -2,7 +2,7 @@ all: pdns-qof.xml
 	xml2rfc pdns-qof.xml
 
 html: pdns-qof.xml
-	xml2html pdns-qof.xml
+	xml2rfc --html pdns-qof.xml
 
 clean:
 	rm -f pdns-qof.txt
diff --git a/i-d/pdns-qof.xml b/i-d/pdns-qof.xml
index 3c20fb3..d79971f 100644
--- a/i-d/pdns-qof.xml
+++ b/i-d/pdns-qof.xml
@@ -50,7 +50,7 @@
 <?rfc subcompact="no" ?>
 <!-- keep one blank line between list items -->
 <!-- end of list of popular I-D processing instructions -->
-<rfc category="info" docName="draft-dulaunoy-dnsop-passive-dns-cof-07" ipr="trust200902">
+<rfc category="info" docName="draft-dulaunoy-dnsop-passive-dns-cof-08" ipr="trust200902">
   <!-- category values: std, bcp, info, exp, and historic
      ipr values: full3667, noModification3667, noDerivatives3667
      you can add the attributes updates="NNNN" and obsoletes="NNNN"
@@ -81,18 +81,19 @@
 
     <author fullname="L. Aaron Kaplan" initials="A."
             surname="Kaplan">
-      <organization>CERT.at</organization>
+      <organization></organization>
       <address>
         <postal>
-          <street>Karlsplatz 1/2/9</street>
+          <street>
+	  </street>
           <city>Vienna</city>
           <region></region>
-          <code>A-1010</code>
+          <code>A-1170</code>
           <country>Austria</country>
         </postal>
-        <phone>+43 1 5056416 78</phone>
-        <email>kaplan@cert.at</email>
-        <uri>http://www.cert.at/</uri>
+        <phone></phone>
+        <email>aaron@lo-res.org</email>
+        <uri></uri>
       </address>
     </author>
 
@@ -203,7 +204,7 @@ ws              = *(
 			<t>Implementation MUST support all the mandatory fields.</t>
 			<t>Uniqueness property: the tuple (rrname,rrtype,rdata) will always be unique within one answer per server. While rrname and rrtype are always individual JSON primitive types (strings, numbers, booleans or null), rdata MAY return multiple resource records or a single record. When multiple resource records are returned, rdata MUST be a JSON array. In the case of a single resource record is returned, rdata MUST be a JSON string or a JSON array containing one JSON string.  Senders SHOULD send an array for rdata, but receivers MUST be able to accept a single-string result for rdata.</t>
 			<section title="rrname">
-				<t>This field returns the name of the queried resource.</t>
+				<t>This field returns the name of the queried resource. <xref target="RFC4627">JSON</xref> string.</t>
 			</section>
 			<section title="rrtype">
 			 <t>This field returns the resource record type as seen by the passive DNS. The key is rrtype and the value is in the interpreted record type represented as a <xref target="RFC4627">JSON</xref> string. If the value cannot be interpreted, the decimal value is returned following the principle of transparency as described in <xref target="RFC3597">RFC 3597</xref>. Then the decimal value is represented as a <xref target="RFC4627">JSON</xref> number.
@@ -259,6 +260,9 @@ ws              = *(
               </section>
         <section title="Additional Fields Registry">
            <t>In accordance with <xref target="RFC6648"/>, designers of new passive DNS applications that would need additional fields can request and register new field name at https://github.com/adulau/pdns-qof/wiki/Additional-Fields.</t>
+        </section>
+		<section title="Additional notes">
+				<t>An implementer of a passive DNS Server MAY chose to either return time_first and time_last OR return zone_time_first and zone_time_last. In pseudocode: (time_first AND time_last) OR (zone_time_first AND zone_time_last). In this case, zone_time_{first,last} replace the time_{first,last} fields. However, this is not encouraged since it might be confusing for parsers who will expect the mandatory fields time_{first,last}. See: <xref target="github_issue_17"/></t>
         </section>
     </section>
 
@@ -394,6 +398,13 @@ ws              = *(
           <date year="2018"/>
           </front>
         </reference>
+        <reference anchor="github_issue_17" target="https://github.com/adulau/pdns-qof/issues/17">
+          <front>
+		  <title>Discussion on the existing implementations of returning either zone_time{first,last} OR time_{first,last}</title>
+          <author fullname="Paul Vixie, Weizman, April, Kaplan, et.al"/>
+		  <date year="2020"/>
+          </front>
+        </reference>
     </references>
 
     <references title="Informative References">