diff --git a/base/pdata.sty b/base/pdata.sty
index 27ef749..1849d98 100644
--- a/base/pdata.sty
+++ b/base/pdata.sty
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{pdata}[2019/03/21 v1.6 Project Data]
+\ProvidesPackage{pdata}[2020/08/21 v1.7 Project Data]
 \RequirePackage{eurosym}
 \newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax%
 \newcounter{@site}%
diff --git a/base/proposal.cls b/base/proposal.cls
index 86f6cd7..1057f1b 100644
--- a/base/proposal.cls
+++ b/base/proposal.cls
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{proposal}[2019/03/21 v1.6 Project Proposal]
+\ProvidesClass{proposal}[2020/08/21 v1.7 Project Proposal]
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
 \newif\ifgrantagreement\grantagreementfalse
diff --git a/base/proposal.dtx b/base/proposal.dtx
index 37c22ba..03da25d 100644
--- a/base/proposal.dtx
+++ b/base/proposal.dtx
@@ -13,10 +13,10 @@
 %
 % \iffalse 
 %<cls|sty|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{proposal}[2019/03/21 v1.6 Project Proposal]
-%<sty>\ProvidesPackage{proposal}[2019/03/21 v1.6 Project Proposal]
-%<pdata>\ProvidesPackage{pdata}[2019/03/21 v1.6 Project Data]
-%<reporting>\ProvidesPackage{reporting}[2019/03/21 v1.6 Project Reporting]
+%<cls>\ProvidesClass{proposal}[2020/08/21 v1.7 Project Proposal]
+%<sty>\ProvidesPackage{proposal}[2020/08/21 v1.7 Project Proposal]
+%<pdata>\ProvidesPackage{pdata}[2020/08/21 v1.7 Project Data]
+%<reporting>\ProvidesPackage{reporting}[2020/08/21 v1.7 Project Reporting]
 %<*driver>
 \documentclass{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
@@ -70,6 +70,7 @@
 % \changes{v1.5}{2014/01/14}{many layout tweaks support for CVs, milestones in gantt}
 % \changes{v1.6}{2016/10/26}{splitting off proposal.sty so that documentation becomes easier}
 % \changes{v1.6}{2017/02/01}{adding site RM/RAM to tasks for fine-grained effort specification}
+% \changes{v1.7}{2020/08/21}{removing dependency on workaddress}
 % 
 % \GetFileInfo{proposal.cls}
 % 
diff --git a/base/proposal.pdf b/base/proposal.pdf
index 59ff181..5eddbed 100644
Binary files a/base/proposal.pdf and b/base/proposal.pdf differ
diff --git a/base/proposal.sty b/base/proposal.sty
index 3ee8583..f781146 100644
--- a/base/proposal.sty
+++ b/base/proposal.sty
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `sty')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{proposal}[2019/03/21 v1.6 Project Proposal]
+\ProvidesPackage{proposal}[2020/08/21 v1.7 Project Proposal]
 \RequirePackage{amssymb}
 \RequirePackage{wasysym}
 \RequirePackage{url}
diff --git a/base/reporting.cls b/base/reporting.cls
index e29a5fa..2130bf8 100644
--- a/base/reporting.cls
+++ b/base/reporting.cls
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{reporting}[2019/03/21 v1.6 Project Reporting]
+\ProvidesPackage{reporting}[2020/08/21 v1.7 Project Reporting]
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
 \newif\ifgrantagreement\grantagreementfalse
diff --git a/dfg/dfgpdata.sty b/dfg/dfgpdata.sty
index 60b89b8..9a0c4cb 100644
--- a/dfg/dfgpdata.sty
+++ b/dfg/dfgpdata.sty
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dfgpdata}[2019/03/21 v1.4 DFG Project Data]
+\ProvidesPackage{dfgpdata}[2020/08/21 v1.5 DFG Project Data]
 \newif\ifdeutsch\deutschfalse
 \DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}}
 \ProcessOptions
diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls
index 70e1610..b64e3ae 100644
--- a/dfg/dfgproposal.cls
+++ b/dfg/dfgproposal.cls
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{dfgproposal}[2019/03/21 v1.4 DFG Proposal]
+\ProvidesClass{dfgproposal}[2020/08/21 v1.5 DFG Proposal]
 \newif\ifgeneral\generalfalse
 \DeclareOption{general}{\generaltrue}
 \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx
index adb7ea7..2f88888 100644
--- a/dfg/dfgproposal.dtx
+++ b/dfg/dfgproposal.dtx
@@ -13,9 +13,9 @@
 %
 % \iffalse 
 %<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{dfgproposal}[2019/03/21 v1.4 DFG Proposal]
-%<pdata>\ProvidesPackage{dfgpdata}[2019/03/21 v1.4 DFG Project Data]
-%<reporting>\ProvidesPackage{dfgreporting}[2019/03/21 v1.4 DFG Project Reporting]
+%<cls>\ProvidesClass{dfgproposal}[2020/08/21 v1.5 DFG Proposal]
+%<pdata>\ProvidesPackage{dfgpdata}[2020/08/21 v1.5 DFG Project Data]
+%<reporting>\ProvidesPackage{dfgreporting}[2020/08/21 v1.5 DFG Project Reporting]
 %<*driver>
 \documentclass[twoside]{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
@@ -43,6 +43,7 @@
 % 
 %\iffalse\CheckSum{629}\fi
 % 
+% \changes{v1.5}{2020/08/21}{removing dependency on workaddress}
 % \changes{v1.1}{2011/03/18}{separating out from new proposal class}
 % \changes{v1.1}{2011/12/09}{various tweaks and corrections}
 % 
diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf
index 3f36e03..c9b68b1 100644
Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ
diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls
index a4db70e..6d3e497 100644
--- a/dfg/dfgreporting.cls
+++ b/dfg/dfgreporting.cls
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dfgreporting}[2019/03/21 v1.4 DFG Project Reporting]
+\ProvidesPackage{dfgreporting}[2020/08/21 v1.5 DFG Project Reporting]
 \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
 \ProcessOptions
diff --git a/eu/eupdata.sty b/eu/eupdata.sty
index 0363896..443dae3 100644
--- a/eu/eupdata.sty
+++ b/eu/eupdata.sty
@@ -7,7 +7,7 @@
 %% euproposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{eupdata}[2019/03/21 v1.5 EU Project Data]
+\ProvidesPackage{eupdata}[2020/08/21 v1.7 EU Project Data]
 \define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
 \define@key{prop@gen}{Csite}{\def\prop@gen@Csite{#1}\pdata@def{prop}{gen}{Csite}{#1}}
 \define@key{prop@gen}{Cemail}{\def\prop@gen@Cemail{#1}\pdata@def{prop}{gen}{Cemail}{#1}}
diff --git a/eu/euproposal.cls b/eu/euproposal.cls
index 64311c2..280063f 100644
--- a/eu/euproposal.cls
+++ b/eu/euproposal.cls
@@ -7,7 +7,7 @@
 %% euproposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{euproposal}[2019/03/21 v1.5 EU Proposal]
+\ProvidesClass{euproposal}[2020/08/21 v1.7 EU Proposal]
 \newif\ifpartB\partBfalse
 \DeclareOption{partB}{\partBtrue}
 \newif\if@split\@splitfalse
diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx
index 0ee4efb..1ed62c4 100644
--- a/eu/euproposal.dtx
+++ b/eu/euproposal.dtx
@@ -13,9 +13,9 @@
 % 
 % \iffalse
 %<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{euproposal}[2019/03/21 v1.5 EU Proposal]
-%<pdata>\ProvidesPackage{eupdata}[2019/03/21 v1.5 EU Project Data]
-%<reporting>\ProvidesPackage{eureporting}[2019/03/21 v1.5 EU Project Reporting]
+%<cls>\ProvidesClass{euproposal}[2020/08/21 v1.7 EU Proposal]
+%<pdata>\ProvidesPackage{eupdata}[2020/08/21 v1.7 EU Project Data]
+%<reporting>\ProvidesPackage{eureporting}[2020/08/21 v1.7 EU Project Reporting]
 %<*driver>
 \documentclass[twoside]{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
@@ -49,8 +49,8 @@
 % \changes{v0.3a}{2008/01/18}{error corrections and more documentation}
 % \changes{v1.3}{2011/05/18}{basing this on proposal.cls}
 % \changes{v1.4}{2012/01/18}{various tweaks for the Jan 2012 proposal deadline}
-% \changes{v1.4}{2015/01/14}{lots of tweaks}
-% 
+% \changes{v1.4}{2015/01/14}{lots of tweaks}%
+% \changes{v1.5}{2020/08/21}{removing dependency on workaddress}
 % \GetFileInfo{euproposal.cls}
 % 
 % \MakeShortVerb{\|}
diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf
index 3c0cb7b..de1949f 100644
Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ
diff --git a/eu/eureporting.cls b/eu/eureporting.cls
index 68e9b97..54b353e 100644
--- a/eu/eureporting.cls
+++ b/eu/eureporting.cls
@@ -7,7 +7,7 @@
 %% euproposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{eureporting}[2019/03/21 v1.5 EU Project Reporting]
+\ProvidesPackage{eureporting}[2020/08/21 v1.7 EU Project Reporting]
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
 \ProcessOptions
 \LoadClass[report]{reporting}
diff --git a/examples/dfg/simple-proposal/proposal.pdf b/examples/dfg/simple-proposal/proposal.pdf
deleted file mode 100644
index 268eaa8..0000000
Binary files a/examples/dfg/simple-proposal/proposal.pdf and /dev/null differ
diff --git a/examples/eu/strep/propB.pdf b/examples/eu/strep/propB.pdf
index c75d9bf..d2f6954 100644
Binary files a/examples/eu/strep/propB.pdf and b/examples/eu/strep/propB.pdf differ