diff --git a/Agreements/NRPDisclaimerAndLicence2.html b/Agreements/NRPDisclaimerAndLicence2.html
index 1fcae39..713f5e0 100644
--- a/Agreements/NRPDisclaimerAndLicence2.html
+++ b/Agreements/NRPDisclaimerAndLicence2.html
@@ -1,8 +1,60 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+        "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8" />
+
+ <title> CAcert - Non-Related Persons - Disclaimer and Licence - WORK - IN PROGRESS </title>
+
+<style type="text/css">  <!-- only for WIP -->
+<!--
+body {
+        font-family : verdana, helvetica, arial, sans-serif;
+}
+
+th {
+        text-align : left;
+}
+
+.q {
+        color : green;
+        font-weight: bold;
+        text-align: center;
+        font-style:italic;
+}
+
+.change {
+        color : blue;
+        font-weight: bold;
+}
+.strike {
+        color : blue;
+        text-decoration:line-through;
+}
+
+-->
+</style>
 
-<html>
-<head><title> CAcert - Non-Related Persons - Disclaimer and Licence </title></head>
 <body>
+        <p>
+        <center><big>
+        <br /><b>WARNING:</b><br />
+        The proper policy document is located<br />
+        <a href="//www.cacert.org/policy/NRPDisclaimerAndLicence.php">
+        on the CAcert website </a>.<br />
+        </big></b />
+        This document is a <b>working document</b> to include<br />
+        future revisions only, and is currently<br />
+        only relevant for the [policy] group.<br />
+        Suggested <span class="change">additions in BLUE</span>,
+        <span class="strike">strikes in blue<span>.<br />
+        </center>
+        Sam <span class="change">20080917</span>: Struck some clauses to add distribution.<br />
+        Iang <span class="change">20100628</span>: reformatted Sam's changes to show differences, <span class="strike">strikes</span> only.<br />
+        </p>
+        <hr />
+
 
 <table width="100%">
 
@@ -13,15 +65,10 @@
 </tr>
 
 <tr>
-<td> WiP </td>
+<td> working changes only - WIP</td>
 <td></td>
 <td>
-  $Date$
-  <!--
-     to get this to work, we have to do this:
-       svn propset svn:keywords "Date" PolicyOnPolicy.html
-     except it does not work through the website.
-   -->
+<a href="https://wiki.cacert.org/TopMinutes-20070917#m20070918.1">m20070918.1</a>
 </td>
 </tr>
 
@@ -33,7 +80,7 @@
 
 </table>
 
-<br><br> <!-- components for posting is below -->
+<br /><br /> <!-- components for posting is below -->
 
 
 
@@ -85,26 +132,26 @@ This licence offers you a non-exclusive, non-transferable
     you may construct connections, read emails,
     load code or otherwise, as facilitated by your
     software.
-  </li><!--<li>
-    <strike>You may NOT RELY on any statements or claims
-    made by the certificates or implied in any way.</strike>
-  </li>--><li>
+  </li><li class="strike">
+    You may NOT RELY on any statements or claims
+    made by the certificates or implied in any way.
+  </li><li>
 	Should you 'RELY' on any statements or claims made by the
 	certificates or implied in any way you do so entirely
 	at your own risk. No claim of reliability is made and
 	and the certificates may be unreliable for any number
 	of reasons, including but not limited to cryptographic
 	weaknesses, key disclosure, fraud and negligence.
-  </li><!--<li>
-    <strike>If your software is licensed under a separate
+  </li><li class="strike">
+    If your software is licensed under a separate
     third party agreement, it may be permitted
     to make statements or claims based on the certificates.
-    You may NOT RELY on these statements or claims.</strike>
-  </li>--><!--<li>
-    <strike>You may NOT distribute certificates or root keys
+    You may NOT RELY on these statements or claims.
+  </li><li class="strike">
+    You may NOT distribute certificates or root keys
     under this licence, nor make representation
-    about them.</strike>
-</li>--></ul>
+    about them.
+</li></ul>
 
 </td></tr></table>
 
@@ -123,11 +170,11 @@ difficult or inadequate for your use, you may wish to
     register with issuer</a>
     and enter into the user agreement.
     This is free.
-  </li><!--<li>
-    <strike>As a Third Party Distributor,
+  </li><li class="strike">
+    As a Third Party Distributor,
     enter into a separate third party agreement
-    with issuer.</strike>
-  </li>--><li>
+    with issuer.
+  </li><li>
     Delete issuer's roots from your software.
     Your software documentation should give
     directions and assistance for this.
