diff --git a/base/pdata.sty b/base/pdata.sty
index 1441acd..ea5fb3c 100644
--- a/base/pdata.sty
+++ b/base/pdata.sty
@@ -42,6 +42,8 @@
 \pdata@def{prop}{gen}{acronym}{#1}\@dmp{acro=#1}}
 \define@key{prop@gen}{acrolong}{\def\prop@gen@acrolong{#1}%
 \pdata@def{prop}{gen}{acrolong}{#1}}
+\define@key{prop@gen}{proposalnumber}{\def\prop@gen@proposalnumber{#1}%
+\pdata@def{prop}{gen}{proposalnumber}{#1}}
 \define@key{prop@gen}{discipline}{\def\prop@gen@discipline{#1}%
 \pdata@def{prop}{gen}{discipline}{#1}}
 \define@key{prop@gen}{areas}{\def\prop@gen@areas{#1}%
diff --git a/base/proposal.cls b/base/proposal.cls
index 73c1b57..e3af61a 100644
--- a/base/proposal.cls
+++ b/base/proposal.cls
@@ -10,6 +10,7 @@
 \ProvidesClass{proposal}[2015/01/14 v1.5 Project Proposal]
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
+\newif\ifgrantagreement\grantagreementfalse
 \newif\ifpublic\publicfalse
 \newif\ifkeys\keysfalse
 \newif\ifdelivs\delivsfalse
@@ -20,6 +21,7 @@
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
+\DeclareOption{grantagreement}{\grantagreementtrue}
 \DeclareOption{gitinfo}{\@gitinfotrue}
 \DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
@@ -72,11 +74,22 @@
 \ifpublic\excludecomment{private}\else\includecomment{private}\fi
 \setcounter{secnumdepth}{3}
 \newif\ifofpage\ofpagefalse
+\ifgrantagreement
+\fancyhead{}
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{0.4pt}
+\else
 \fancyhead[RE,LO]{\prop@gen@acronym}
 \fancyhfoffset{0pt}
+\fi
 \fancyfoot[C]{}
 \newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
+\ifgrantagreement
+\fancyfoot[L]{\prop@gen@proposalnumber\quad \prop@gen@acronym\quad --\quad Part B}
+\fancyfoot[R]{\thepage}
+\else
 \fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
+\fi
 \pagestyle{fancyplain}
 \newmdenv[settings=\large]{emphbox}
 \newenvironment{prop@proposal}
@@ -200,10 +213,12 @@
 {\@ifundefined{@tasks}{}{\pdata@def{\wp@id}{task}{ids}\@tasks}}
 \newenvironment{workpackage}[1][]%
 {\begin{work@package}[#1]%
+\ifgrantagreement\else
 \if@sites\goodbreak\medskip\wpheadertable%
 \else\subsubsection*{{\wptitle} (\wprm)}\fi%
 \addcontentsline{toc}{paragraph}{{\wp@mk@title\thewp}: \pdataref{wp}\wp@id{title}}%
-\noindent\ignorespaces}
+\noindent\ignorespaces%
+\fi}
 {\end{work@package}}
 \newcommand\wptitle{\wp@mk@title{\wp@num}: \pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}
 \newcommand\wprm{\pdataref@safe{wp}\wp@id{RM}\if@RAM\ RM+\pdataref{wp}\wp@id{RAM} RAM\fi}
@@ -338,6 +353,7 @@
 \else\def\current@label{\deliv@label{\thewa.\thedeliv}}\fi
 \pdata@def{deliv}{\wpg@id\deliv@id}{label}{\current@label}
 \pdata@def{deliv}{\wpg@id\deliv@id}{title}{#2}
+\pdata@def{deliv}{\wpg@id\deliv@id}{page}{\thepage}%
 \@ifundefined{deliv@short}
 {\pdata@def{deliv}{\wpg@id\deliv@id}{short}{#2}}
 {\pdata@def{deliv}{\wpg@id\deliv@id}{short}{\deliv@short}}
@@ -386,11 +402,13 @@
 \newcounter{milestone}
 \define@key{milestone}{id}{\gdef\mile@id{#1}}
 \define@key{milestone}{month}{\gdef\mile@month{#1}}
+\define@key{milestone}{verif}{\gdef\mile@verif{#1}}
 \newcommand\milestone[3][]{%
 \ifdelivs%
 \setkeys{milestone}{#1}\stepcounter{milestone}%
 \pdata@def{mile}\mile@id{label}{\milestone@label{\themilestone}}%
 \pdata@def{mile}\mile@id{month}{\mile@month}%
+\pdata@def{mile}\mile@id{verif}{\mile@verif}%
 \pdata@def{mile}\mile@id{title}{#2}%
 \pdata@def{mile}\mile@id{description}{#3}%
 \@ifundefined{mile@stones}{\xdef\mile@stones{\mile@id}}{\xdef\mile@stones{\mile@stones,\mile@id}}%
diff --git a/base/proposal.pdf b/base/proposal.pdf
index 01f0e54..3b7294e 100644
Binary files a/base/proposal.pdf and b/base/proposal.pdf differ
diff --git a/base/reporting.cls b/base/reporting.cls
index 4f28be2..daa639b 100644
--- a/base/reporting.cls
+++ b/base/reporting.cls
@@ -10,6 +10,7 @@
 \ProvidesPackage{reporting}[2015/01/14 v1.5 Project Reporting]
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
+\newif\ifgrantagreement\grantagreementfalse
 \newif\ifpublic\publicfalse
 \newif\ifkeys\keysfalse
 \newif\ifdelivs\delivsfalse
@@ -20,6 +21,7 @@
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
+\DeclareOption{grantagreement}{\grantagreementtrue}
 \DeclareOption{gitinfo}{\@gitinfotrue}
 \DeclareOption{svninfo}{\@svninfotrue}
 \DeclareOption{public}{\publictrue}
@@ -72,11 +74,22 @@
 \ifpublic\excludecomment{private}\else\includecomment{private}\fi
 \setcounter{secnumdepth}{3}
 \newif\ifofpage\ofpagefalse
+\ifgrantagreement
+\fancyhead{}
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{0.4pt}
+\else
 \fancyhead[RE,LO]{\prop@gen@acronym}
 \fancyhfoffset{0pt}
+\fi
 \fancyfoot[C]{}
 \newcommand\prop@of@pages[2]{page~#1\ifofpage~of~#2\fi}
+\ifgrantagreement
+\fancyfoot[L]{\prop@gen@proposalnumber\quad \prop@gen@acronym\quad --\quad Part B}
+\fancyfoot[R]{\thepage}
+\else
 \fancyhead[LE,RO]{\prop@of@pages\thepage{\pdataref@num{prop}{page}{last}}}
+\fi
 \pagestyle{fancyplain}
 \newif\if@report\@reportfalse
 \newenvironment{report}[1][]%
diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf
index 437b7ab..467d33c 100644
Binary files a/dfg/examples/proposal/proposal.pdf and b/dfg/examples/proposal/proposal.pdf differ
diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf
index 7bc1160..71650fe 100644
Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ
diff --git a/dfg/examples/simple-proposal/proposal-blx.bib b/dfg/examples/simple-proposal/proposal-blx.bib
index e50c35d..61af548 100644
--- a/dfg/examples/simple-proposal/proposal-blx.bib
+++ b/dfg/examples/simple-proposal/proposal-blx.bib
@@ -1,5 +1,5 @@
 @Comment{$ biblatex control file $}
-@Comment{$ biblatex version 2.4 $}
+@Comment{$ biblatex version 2.5 $}
 Do not modify this file!
 
 This is an auxiliary file used by the 'biblatex' package.
@@ -7,5 +7,5 @@ This file may safely be deleted. It will be recreated as
 required.
 
 @Control{biblatex-control,
-  options = {2.4:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
+  options = {2.5:0:0:1:0:0:1:1:0:0:0:0:1:1:3:1:79:+},
 }
diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf
index dfa346b..a75bfe5 100644
Binary files a/dfg/examples/simple-proposal/proposal.pdf and b/dfg/examples/simple-proposal/proposal.pdf differ
diff --git a/eu/euproposal.cls b/eu/euproposal.cls
index 6449df5..9df18c6 100644
--- a/eu/euproposal.cls
+++ b/eu/euproposal.cls
@@ -38,7 +38,8 @@
 \@@table
 \end{tabular}}
 \renewenvironment{prop@proposal}
-{\thispagestyle{empty}\begin{center}
+{\ifgrantagreement\else
+  \thispagestyle{empty}\begin{center}
   {\Large \prop@gen@instrument}\\[.2cm]
   {\Large\textbf\prop@gen@callname}\\[.4cm]
   {\LARGE \prop@gen@callid}\\[.8cm]
@@ -68,6 +69,7 @@
 {\@for\@site:=\prop@gen@sites\do{\wa@institution@logo[height=\prop@gen@iconrowheight]\@site\qquad}}
 \end{center}
 \newpage
+\fi% ifgrantagreement
 \setcounter{tocdepth}{2}\setcounter{part}{2}}
 {\newpage\printbibliography[heading=warnpubs,maxnames=999]}
 \def\prop@gen@instrument{Proposal Instrument (e.g. IP)}
diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf
index 984a941..af08460 100644
Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ
diff --git a/eu/examples/fetopenstrep/propB.pdf b/eu/examples/fetopenstrep/propB.pdf
index cd5f4bc..21ba7d9 100644
Binary files a/eu/examples/fetopenstrep/propB.pdf and b/eu/examples/fetopenstrep/propB.pdf differ
diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf
deleted file mode 100644
index ed3bc6b..0000000
Binary files a/eu/examples/strep/propB.pdf and /dev/null differ