diff --git a/xml/source/snippets/localisationstrings.xml b/xml/source/snippets/localisationstrings.xml
index 3edb202..93ed864 100644
--- a/xml/source/snippets/localisationstrings.xml
+++ b/xml/source/snippets/localisationstrings.xml
@@ -204,9 +204,9 @@
     <translation xml:lang="nl">namens</translation>
     <translation xml:lang="en">for</translation>
   </string>
-  <string id="signed_dupe">
-    <translation xml:lang="nl">In duplicaat getekend</translation>
-    <translation xml:lang="en">Signed in duplicate</translation>
+  <string id="signed">
+    <translation xml:lang="nl">Getekend</translation>
+    <translation xml:lang="en">Signed</translation>
   </string>
   <!-- CONTRACTS -->
   <string id="contract_title">
diff --git a/xml/source/snippets/offerte/en/conditions.xml b/xml/source/snippets/offerte/en/conditions.xml
index da05d6f..52fc245 100644
--- a/xml/source/snippets/offerte/en/conditions.xml
+++ b/xml/source/snippets/offerte/en/conditions.xml
@@ -30,19 +30,30 @@
       <company_city/>
     </address>
   </contact>
-
   <signature_box>
     <client_side>
-      <signee><client_legal_rep/></signee>
+      <signee>
+        <client_legal_rep/>
+      </signee>
       <!--<signee>Second signee for company</signee>-->
-      <date><latest_version_date/></date>
-      <place><client_city/></place>
+      <date>
+        <latest_version_date/>
+      </date>
+      <place>
+        <client_city/>
+      </place>
     </client_side>
     <company_side>
-      <signee><company_legal_rep/></signee>
+      <signee>
+        <company_legal_rep/>
+      </signee>
       <!--<signee>Second signee for company</signee>-->
-      <date><latest_version_date/></date>
-      <place><company_city/></place>
+      <date>
+        <latest_version_date/>
+      </date>
+      <place>
+        <company_city/>
+      </place>
     </company_side>
   </signature_box>
 </section>
diff --git a/xml/source/snippets/offerte/en/conditions_code-audit.xml b/xml/source/snippets/offerte/en/conditions_code-audit.xml
index 2ca51f2..4fd7615 100644
--- a/xml/source/snippets/offerte/en/conditions_code-audit.xml
+++ b/xml/source/snippets/offerte/en/conditions_code-audit.xml
@@ -2,26 +2,58 @@
 <section>
   <title>Terms and Conditions</title>
   <p>
-    <company_short/> will only perform the <company_svc_short/> 
-    if it has obtained the permission from <generate_permission_parties/> 
-    as set out in the waiver, attached as <b>Annex 2</b>, 
-    or provided in a separate document.
-  </p>
+    <company_short/> will only perform the <company_svc_short/> if it has obtained the permission
+    from <generate_permission_parties/> as set out in the waiver, attached as <b>Annex 2</b>, or
+    provided in a separate document. </p>
 
   <p>
-    <company_short/> performs this assignment on the basis of its general 
-    terms and conditions, which are attached to this offer as Annex 1. 
-    <company_short/> rejects any general terms and conditions used by 
-    <client_short/>.
-  </p>
-  <p>
-    In order to agree to this offer, please sign this letter in duplicate 
-    and return it to:
-  </p>
+    <company_short/> performs this assignment on the basis of its general terms and conditions,
+    which are attached to this offer as Annex 1. <company_short/> rejects any general terms and
+    conditions used by <client_short/>. </p>
+  <p>In order to agree to this offer, please sign the quote and waiver and return it to: </p>
   <contact>
-    <name><company_legal_rep/></name>
-    <address><company_long/><br/><company_address/><br/><company_postalcode/> <company_city/></address>
-    <email><company_email/></email>
+    <email>
+      <company_email/>
+    </email>
   </contact>
-  <generate_offer_signature_box/>
+  <p>or:</p>
+  <contact>
+    <name>
+      <company_legal_rep/>
+    </name>
+    <address>
+      <company_long/>
+      <br/>
+      <company_address/>
+      <br/>
+      <company_postalcode/>
+      <company_city/>
+    </address>
+  </contact>
+  <signature_box>
+    <client_side>
+      <signee>
+        <client_legal_rep/>
+      </signee>
+      <!--<signee>Second signee for company</signee>-->
+      <date>
+        <latest_version_date/>
+      </date>
+      <place>
+        <client_city/>
+      </place>
+    </client_side>
+    <company_side>
+      <signee>
+        <company_legal_rep/>
+      </signee>
+      <!--<signee>Second signee for company</signee>-->
+      <date>
+        <latest_version_date/>
+      </date>
+      <place>
+        <company_city/>
+      </place>
+    </company_side>
+  </signature_box>
 </section>
diff --git a/xml/xslt/block.xslt b/xml/xslt/block.xslt
index 21e9436..604ccdd 100644
--- a/xml/xslt/block.xslt
+++ b/xml/xslt/block.xslt
@@ -73,7 +73,7 @@
         <fo:block keep-together.within-page="always" xsl:use-attribute-sets="signaturebox">
             <fo:block xsl:use-attribute-sets="title-client">
                 <xsl:call-template name="getString">
-                    <xsl:with-param name="stringID" select="'signed_dupe'"/>
+                    <xsl:with-param name="stringID" select="'signed'"/>
                 </xsl:call-template>
             </fo:block>
             <fo:block>
diff --git a/xml/xslt/waiver.xslt b/xml/xslt/waiver.xslt
index d79cab8..cbbad5c 100644
--- a/xml/xslt/waiver.xslt
+++ b/xml/xslt/waiver.xslt
@@ -140,66 +140,57 @@
         <xsl:param name="signee_long" tunnel="yes"/>
         <xsl:param name="signee_waiver_rep" tunnel="yes"/>
         <xsl:param name="signee_city" tunnel="yes"/>
+        
         <fo:block keep-together.within-page="always" xsl:use-attribute-sets="signaturebox">
-            <fo:table width="100%" table-layout="fixed">
-                <fo:table-column column-width="proportional-column-width(10)"/>
-                <fo:table-column column-width="proportional-column-width(90)"/>
-                <fo:table-body>
-                    <fo:table-row>
-                        <fo:table-cell xsl:use-attribute-sets="td" number-rows-spanned="4">
-                            <fo:block>
-                                <xsl:call-template name="getString">
-                                    <xsl:with-param name="stringID" select="'waiver_signed'"/>
-                                </xsl:call-template>
-                            </fo:block>
-                        </fo:table-cell>
-                        <fo:table-cell xsl:use-attribute-sets="td">
-                            <fo:block xsl:use-attribute-sets="p"><xsl:call-template name="getString">
-                                    <xsl:with-param name="stringID" select="'waiver_signed_on'"/>
-                                </xsl:call-template> &#160;&#160;&#160;<xsl:value-of
-                                    select="$latestVersionDate"/></fo:block>
-                        </fo:table-cell>
-                    </fo:table-row>
-                    <fo:table-row>
-                        <fo:table-cell xsl:use-attribute-sets="td">
-                            <fo:block xsl:use-attribute-sets="p"><xsl:call-template name="getString">
-                                    <xsl:with-param name="stringID" select="'waiver_signed_in'"/>
-                                </xsl:call-template> &#160;&#160;&#160; <xsl:value-of
-                                    select="$signee_city"/></fo:block>
-                        </fo:table-cell>
-                    </fo:table-row>
-                    <fo:table-row>
-                        <fo:table-cell xsl:use-attribute-sets="td">
-                            <xsl:choose>
-                                <xsl:when test="$signee_waiver_rep">
-                                    <fo:block xsl:use-attribute-sets="p"><xsl:call-template
-                                            name="getString">
-                                            <xsl:with-param name="stringID"
-                                                select="'waiver_signed_by'"/>
-                                        </xsl:call-template> &#160;&#160;&#160;<xsl:value-of
-                                            select="$signee_waiver_rep"/></fo:block>
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <fo:block xsl:use-attribute-sets="p"><xsl:call-template
-                                            name="getString">
-                                            <xsl:with-param name="stringID"
-                                                select="'waiver_signed_by'"/>
-                                        </xsl:call-template>
-                                        &#160;&#160;&#160;__________________________________</fo:block>
-                                </xsl:otherwise>
-                            </xsl:choose>
-                        </fo:table-cell>
-                    </fo:table-row>
-                    <fo:table-row>
-                        <fo:table-cell xsl:use-attribute-sets="td">
-                            <fo:block xsl:use-attribute-sets="p"><xsl:call-template name="getString">
-                                    <xsl:with-param name="stringID" select="'waiver_signed_for'"/>
-                                </xsl:call-template> &#160;&#160;&#160;<xsl:value-of
-                                    select="$signee_long"/></fo:block>
-                        </fo:table-cell>
-                    </fo:table-row>
-                </fo:table-body>
-            </fo:table>
+            <fo:block xsl:use-attribute-sets="title-client">
+                <xsl:call-template name="getString">
+                    <xsl:with-param name="stringID" select="'signed'"/>
+                </xsl:call-template>
+            </fo:block>
+            <fo:block>
+                <fo:table xsl:use-attribute-sets="fwtable borders">
+                    <fo:table-column column-width="proportional-column-width(50)"/>
+                    <fo:table-column column-width="proportional-column-width(50)"/>
+                    <fo:table-body>
+                        <fo:table-row>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <fo:block>For <fo:inline xsl:use-attribute-sets="bold"><xsl:value-of
+                                            select="$signee_long"/></fo:inline></fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell><fo:block></fo:block></fo:table-cell>
+                        </fo:table-row>
+                        <fo:table-row>
+                            <!-- client side -->
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:for-each select="$signee_waiver_rep">
+                                    <xsl:call-template name="signeeBlock"/>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                            <fo:table-cell><fo:block></fo:block></fo:table-cell>
+                        </fo:table-row>
+                        <fo:table-row>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:for-each select="$signee_city">
+                                    <fo:block>
+                                        <xsl:apply-templates/>
+                                    </fo:block>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                            <fo:table-cell><fo:block></fo:block></fo:table-cell>
+                        </fo:table-row>
+                        <fo:table-row>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:for-each select="$latestVersionDate">
+                                    <fo:block>
+                                        <xsl:apply-templates/>
+                                    </fo:block>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                            <fo:table-cell><fo:block></fo:block></fo:table-cell>
+                        </fo:table-row>
+                    </fo:table-body>
+                </fo:table>
+            </fo:block>
         </fo:block>
     </xsl:template>