diff --git a/base/pdata.sty b/base/pdata.sty
index fb8f99c..ac22fc8 100644
--- a/base/pdata.sty
+++ b/base/pdata.sty
@@ -16,9 +16,9 @@
 \stepcounter{@site}\pdata@def{site}{#1}{number}{\the@site}%
 \@ifundefined{prop@gen@sites}{\xdef\prop@gen@sites{#1}}{\xdef\prop@gen@sites{\prop@gen@sites,#1}}%
 \define@key{prop@gen}{#1RM}{\pdata@def{site}{#1}{intendedRM}{##1}}%
-\if@RAM\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}\fi
+\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}
 \define@key{workpackage}{#1RM}{\pdata@def\wp@id{#1}{RM}{##1}}%
-\if@RAM\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}\fi
+\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}
 \define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let\wa@ref\relax%
 \@ifundefined{prop@gen@employed@lines}%
 {\xdef\prop@gen@employed@lines{\wa@ref{institution}{#1}{shortname} & ##1\tabularnewline\hline}}%
diff --git a/base/proposal.cls b/base/proposal.cls
index 0a5ce18..010f03b 100644
--- a/base/proposal.cls
+++ b/base/proposal.cls
@@ -117,7 +117,7 @@
 \pdata@open\jobname
 \if@sites\else
 \define@key{workpackage}{RM}{\pdata@def{wp}\wp@id{RM}{##1}\@dmp{RM=##1}}
-\if@RAM\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}\fi
+\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}
 \fi
 \newcounter{@PIs}
 \@ifundefined{prop@gen@PIs}{}{\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}}
@@ -125,7 +125,7 @@
 \@ifundefined{prop@gen@sites}{}{\@for\@I:=\prop@gen@sites\do{\stepcounter{@sites}}}
 \setcounter{page}{0}
 \begin{prop@proposal}}
-{\end{prop@proposal}\message{*************}
+{\end{prop@proposal}
 \pdata@def{prop}{page}{last}{\thepage}\ofpagefalse
 \pdata@close}
 \newcommand\site[1]{\hyperlink{site@#1@target}{\wa@ref{institution}{#1}{acronym}}}
diff --git a/base/proposal.dtx b/base/proposal.dtx
index 325e496..957378b 100644
--- a/base/proposal.dtx
+++ b/base/proposal.dtx
@@ -699,9 +699,9 @@
 \stepcounter{@site}\pdata@def{site}{#1}{number}{\the@site}%
 \@ifundefined{prop@gen@sites}{\xdef\prop@gen@sites{#1}}{\xdef\prop@gen@sites{\prop@gen@sites,#1}}%
 \define@key{prop@gen}{#1RM}{\pdata@def{site}{#1}{intendedRM}{##1}}%
-\if@RAM\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}\fi
+\define@key{prop@gen}{#1RAM}{\pdata@def{site}{#1}{intendedRAM}{##1}}
 \define@key{workpackage}{#1RM}{\pdata@def\wp@id{#1}{RM}{##1}}%
-\if@RAM\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}\fi
+\define@key{workpackage}{#1RAM}{\pdata@def\wp@id{#1}{RAM}{##1}}
 \define@key{prop@gen}{#1employed}{{\let\tabularnewline\relax\let\hline\relax\let\wa@ref\relax%
 \@ifundefined{prop@gen@employed@lines}%
 {\xdef\prop@gen@employed@lines{\wa@ref{institution}{#1}{shortname} & ##1\tabularnewline\hline}}%
@@ -848,7 +848,7 @@
 \pdata@open\jobname
 \if@sites\else
 \define@key{workpackage}{RM}{\pdata@def{wp}\wp@id{RM}{##1}\@dmp{RM=##1}}
-\if@RAM\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}\fi
+\define@key{workpackage}{RAM}{\pdata@def{wp}\wp@id{RAM}{##1}\@dmp{RAM=##1}}
 \fi
 \newcounter{@PIs}
 \@ifundefined{prop@gen@PIs}{}{\@for\@I:=\prop@gen@PIs\do{\stepcounter{@PIs}}}
diff --git a/base/proposal.pdf b/base/proposal.pdf
index c721e22..d58a139 100644
Binary files a/base/proposal.pdf and b/base/proposal.pdf differ