diff --git a/NEWPROPOSAL/FULLPROP.tex b/NEWPROPOSAL/FULLPROP.tex
index 855dbef0a6354409594098e96fc491afa50ac76d..a11cea64021ee40679c6b1bdf182e7e6a8025df5 100644
--- a/NEWPROPOSAL/FULLPROP.tex
+++ b/NEWPROPOSAL/FULLPROP.tex
@@ -1190,13 +1190,15 @@ collaboration is a strong point of this project.
 }
 
 \newpage
+
+\def\partnerref#1{{\hypersetup{hidelinks}\ref{#1}}}
+  
 \subsection{Work Packages \REM{1page per WP}}
 \label{sec:work-packages}
 
-\TODOb{Partner contributions missing in all WPs.}
 \begin{WP}{A quantum compiler stack}{1M}{36M}{wp:frontend}
 \WPleaderLOR
-\WPeffort{0}{0}{0}{0}{\newt{12}}{0}
+\WPeffort{0}{14}{32}{5}{\newt{12}}{3}
 \begin{WPaim}
   This WP develops elements of \zx as an abstract intermediate
   compiler language.  We provide interface between \zx and known
@@ -1228,24 +1230,29 @@ collaboration is a strong point of this project.
 %    goals of the project, 
 %    %
 %  }
-  \WPtask[\label{task:HHL}]{Front-end (M3--M36; responsible 3;
-    involved 2,4,5) }{%
+  \WPtask[\label{task:HHL}]{Front-end (M3--M36; responsible \partnerref{partner:oxford};
+    involved \partnerref{partner:loria},\partnerref{partner:CQC},\partnerref{partner:gdansk}) }{%
     Propose compiler front-ends from known HLLs such as QASM, Quipper
     or \Qsharp to \dzxc. This task serves as a test-bed
     for~\ref{task:trans1} and~\ref{task:testBench}. It will make
     it possible to test
     the {\dzxc} framework on real, possibly very large instances of
     programs. This task will progressively incorporate new features
-    of the \dzxc language as they are developed,
-    especially in concert with \ref{task:betterboxes}.
+    of the \dzxc language %as they are
+    developed
+    % especially in concert with
+    in \ref{task:betterboxes}.
     %
   }
   \WPtask[\label{task:trans1}]{Open API for \dzxc  (M1--M36;
-    responsible 3; involved 2,4,5)}{%
+    responsible \partnerref{partner:oxford}; involved \partnerref{partner:loria},\partnerref{partner:CQC},\partnerref{partner:gdansk})}{%
     Develop an open API for the description of ZX terms. While
-    largely technical, it is nonetheless essential as it will be used
+    largely technical, it is% nonetheless
+    essential as it will be used
     as interface to express the benchmarks of
-    Task~\ref{task:testBench} to feed to the other WPs. The API will
+    Task~\ref{task:testBench}.
+    % to feed to the other WPs.
+    The API will
     first be built upon the existing JSON representation for the
     \zxcalculus. It will be expanded with the features of \dzxc as they
     become available. This task is tightly linked with
@@ -1253,7 +1260,7 @@ collaboration is a strong point of this project.
     %
   }
   \WPtask[\label{task:testBench}]{Open test-suite (M3--M36;
-    responsible 3; involved 2,4,5) }{%
+    responsible \partnerref{partner:oxford}; involved \partnerref{partner:loria},\partnerref{partner:CQC},\partnerref{partner:gdansk}) }{%
 Devise test-suite of concrete instances of circuits and
     algorithms to rate success of other WPs. This includes the task of protocol extraction from current known HLLs.
     The tests will rate various aspects of algorithms, such as controls, manipulation of
@@ -1262,7 +1269,7 @@ Devise test-suite of concrete instances of circuits and
     %
   }
   \WPtask[\label{task:circuit-model}]{Idealised quantum circuits
-    (M1--M9; Responsible 2; Involved: 1,3,4)}{%
+    (M1--M9; Responsible \partnerref{partner:loria}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:CQC})}{%
     Translate an \zx term to an equivalent quantum circuit with ideal
     gates.  This will require algorithms for discovering a suitable
     causal ordering on the \zx term, and for decomposing it into
@@ -1270,7 +1277,7 @@ Devise test-suite of concrete instances of circuits and
     circuits with constrained width, depth and/or layout.  %The output format will be QASM \cite{Cross2017Open-Quantum-As}, suitable to run on a simulator.
     }  
 \WPtask[\label{task:mbqc-model}]{Idealised
-    1-Way Quantum Computation (M1--M12; Responsible 3; Involved: 1,2)}{%
+    1-Way Quantum Computation (M1--M12; Responsible \partnerref{partner:oxford}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria})}{%
     Translate a \zx term to a runnable 1WQC
     \cite{Raussendorf-2001} with ideal measurements and state
     preparation.  Since every term of the \zxcalculus can be trivially
@@ -1279,7 +1286,7 @@ Devise test-suite of concrete instances of circuits and
     and topology of the underlying graph states, and limits on the
     number of measurement rounds.  The output
     language will be the Measurement Calculus \cite{DanosV:meac}.}
-      \WPtask[\label{task:backendapi}]{Back-end API (M24--M36 Responsible: 5; Involved: 1,2,3,4)}{%
+      \WPtask[\label{task:backendapi}]{Back-end API (M24--M36 Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford},\partnerref{partner:CQC})}{%
       Open specification of an API for back-end modules, facilitating third-party  development of specifications of target architectures, providing the \dzxc compiler with extendability to arbitrary hardware platforms.
 %    \BREM{
 %      Define open API for back-end modules.}
@@ -1316,34 +1323,37 @@ We build the theoretical foundations for \zx as an intermediate representation.
 \end{WPaim}
 \begin{WPtasks} 
     \WPtask[\label{task:axioms}]{Beyond qubits and stabilisers 
-      (M1--M12; Responsible: 2; Involved: 1,3,5)}{%
+   \newt{   (M1--M14; Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:loria},\partnerref{partner:gdansk})}}{%
     %We will exploit further the recent completeness results to give representations for mixed state qubit quantum theory. We will
     %extend the \textsc{zx} tensor formalism from the qubit domain to higher dimensions.
     We will extend the completeness results of the \textsc{zx}-calculus from the qubit domain to higher dimensions, to have complete qudit \textsc{zx}-calculus. Furthermore, we will combine all the qudit \textsc{zx}-calculus into a single framework so that we can deal with the whole finite-dimensional quantum theory in a \textsc{zx} style. In addition, we will exploit techniques from the \textsc{zw}-calculus to understand the deep structure of  W-type tensors.        
     % and exploit the translation from \textsc{zx}-    to \textsc{zw}-calculus.
     }
   \WPtask[\label{task:betterboxes}]{Control in \zx
-    (M1--M18; Responsible: 1; Involved: 2,3,5)}{%
+    \newt{  \ (M1--M18; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}}{%
    % Support simple control flow at the level of \azx, making it a more suitable target for compiling from a high-level language. In particular, add support for repetition and recursive definitions of diagrams, e.g. for expressing and transforming regular families of circuits. 
    We will use parametric \zx terms to support simple control flow at the level of the \dzxc system, making it a more suitable target for compiling from a high-level language. In particular, we will add support for repetition and recursive definitions of diagrams, e.g. for expressing and transforming regular families of circuits. 
   }
       \WPtask[\label{task:resources}]{Resources and axioms
-    (M1--M18; Responsible: 1; Involved: 2,3,5)}{%
+   \newt{ (M1--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}}{%
 We will exploit the three axiom sets for Clifford, Clifford+T, and universal qubit QM,
 to identify and distill specific resources that are necessary to quantum speed-up. In particular, to focus on finding multiple resource elements (rather than simply magic states), and to characterise post-classical composition as a resource.
 This includes developing \zx representations of contextuality, as a possible post-classical resource.
     }
           \WPtask[\label{task:resourcesagain}]{Computational resources
-    (M1--M18; Responsible: 1; Involved: 2,3,5)}{%
+  \newt{  (M12--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:CQC},\partnerref{partner:radboud})}}{%
 We will use the existing graph re-writing and automated theorem proving tools of Quantomatic and PyZX to determine parts of the re-writing process that are difficult to compute classically. This will then be used to extract candidate subroutines for sources of quantum speed-up. Along with the previous task, these will be used to develop procedures for characterising if a \zx-represented algorithm demonstrates speed-up or not.
     }
  
 \end{WPtasks}
 \begin{WPdeliverables}
-  \WPdeliverable{M12}{Preliminary assessment of the comparative study of the axiomatizations of paradigms of quantum computation} 
-  \WPdeliverable{M15}{\zx representation and explanation of the result that promotes magic states as a resource of quantum computation in the state injection paradigm} 
-  \WPdeliverable{M18}{Preliminary assessment of nonclassicality of re-writing processes} 
-    \WPdeliverable{M24}{\zx formulation of contextuality (Kochen--Specker and/or generalised Spekken's type)} 
+  \WPdeliverable{M9}{Preliminary assessment of the comparative study of the axiomatizations of paradigms of quantum computation} 
+   \WPdeliverable{M14}{Completeness  of qudit \zx calculus} 
+    \WPdeliverable{M18}{\zx formalism for recursion and control} 
+  \WPdeliverable{M20}{Preliminary assessment of nonclassicality of re-writing processes} 
+    \WPdeliverable{M24}{\zx representation and explanation of the result that promotes magic states as a resource of quantum computation} 
+    \WPdeliverable{M30}{\zx formulation of contextuality (Kochen--Specker and/or Spekken's)} 
+       \WPdeliverable{M36}{Characterisation of set of generic non-classical resources for quantum speed-up} 
 \end{WPdeliverables}
 \end{WP}
 
@@ -1365,7 +1375,7 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
   \end{WPaim}
   \begin{WPtasks}
     \WPtask[\label{task:algorithms}]{Reduction strategies, algorithms,
-      and complexity (M1--M24; \newt{Responsible: 6; Involved: 2, 3, 4})}{%
+      and complexity (M1--M24; \newt{Responsible: \partnerref{partner:radboud}; Involved: \partnerref{partner:loria}, \partnerref{partner:oxford}, \partnerref{partner:CQC}})}{%
       Develop new strategies for simplifying \textsc{zx}-style tensor
       networks and reducing to (pseudo) normal forms, with the help of
       automated techniques such as Knuth-Bendix completion and
@@ -1374,14 +1384,14 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
     }
 
     \WPtask[\label{task:annotate1}]{Topological and causal constraints 
-      (M1--M18; \newt{Responsible: 3; Involved: 4,6})}{%
+      (M1--M18; \newt{Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:CQC},\partnerref{partner:radboud}})}{%
       Extend \dzxc language and tools to express and enforce: (1) topological
       constaints, such as nearest-neighbour connectivity of qubits and
       (2) causal/temporal constraints, such as sequential ordering of
       measurements and classically-controlled operations.
     }
     \WPtask[\label{task:annotate2}]{Quantitative Properties (M13--M24; 
-      \newt{Responsible: 4; Involved: 3, 4, 6})}{%
+      \newt{Responsible: \partnerref{partner:CQC}; Involved: \partnerref{partner:oxford}, \partnerref{partner:CQC}, \partnerref{partner:radboud}})}{%
       Extend \dzxc language and tools to account for several kinds of
       numerical annotations, e.g.~timing data related to performing
       operations, gate fidelities, channel fidelities, and decoherence
@@ -1391,7 +1401,7 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
       quantities from local to global properties.  
     }
         \WPtask[\label{task:basic-opt}]{Generic optimisations of ZX-terms 
-      (M12--M24; \newt{Responsible: 3;   Involved: 2, 4, 6})}{% 
+      (M12--M24; \newt{Responsible: \partnerref{partner:oxford};   Involved: \partnerref{partner:loria}, \partnerref{partner:CQC}, \partnerref{partner:radboud}})}{% 
       Use the results of task~\ref{task:algorithms} to develop
       procedures to optimise \zx-terms, in a way which is applicable
       for families of circuits (e.g.~Clifford, Clifford+T, CNOT+T,
@@ -1403,7 +1413,7 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
       }
 %%
       \WPtask[\label{task:ECC}]{Application of Error-Correction
-        (M1--M24; \newt{Responsible: 3; Involved: 1, 5})}{%
+        (M1--M24; \newt{Responsible: \partnerref{partner:oxford}; Involved: \partnerref{partner:grenoble}, \partnerref{partner:gdansk}})}{%
         Develop algorithms which rewrite abstract tensor networks to
         equivalent tensors in codeword space of a chosen
         error-correcting code.  This may be combined with additional
@@ -1450,8 +1460,8 @@ We import machine-dependent specifications to \zx terms, and use this to optimis
 Also machine-dependent error correction here?
   \end{WPaim}
   \begin{WPtasks}
-\WPtask[\label{task:qdot-model}]{Grenoble quantum dots (M13--M36  Responsible: 2;
-  Involved: 1,5)}{
+\WPtask[\label{task:qdot-model}]{Grenoble quantum dots (M13--M36  Responsible: \partnerref{partner:loria};
+  Involved: \partnerref{partner:grenoble},\partnerref{partner:gdansk})}{
   We will model the quantum dot device being developed in Grenoble, and extract specific annotations for
   \zx that describe key elements of the architecture.  This will
   include qubit layout on wafers, network connectivity, and timing
@@ -1460,13 +1470,13 @@ Also machine-dependent error correction here?
   instructions -- output language to be defined in collaboration with
   the team at LETI.
 }
-\WPtask[\label{task:NQIT-model}]{Oxford ion traps (M13--M30  Responsible: 5;
-  Involved: 1,2)}{% 
+\WPtask[\label{task:NQIT-model}]{Oxford ion traps (M13--M30  Responsible: \partnerref{partner:gdansk};
+  Involved: \partnerref{partner:grenoble},\partnerref{partner:loria})}{% 
   In collaboration with the Oxford ion trap group and the NQIT team, we will design an output module which generates code for a realistic model of
   ion trap quantum computers, including qubit losses and leakage, gate
   timings, and circuit layout. Output language to be defined in collaboration with hardware experts at Oxford.}
   \WPtask[\label{task:runnable}]{Formatting for target systems 
-    (M15--M30; Responsible: 2; Involved: 1,3,5)}{%
+    (M15--M30; Responsible: \partnerref{partner:loria}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:gdansk})}{%
     Develop algorithms which, given a collection of constraints
     representing a machine model
     (c.f.~\ref{task:annotate1}, \ref{task:annotate2}), re-writes \dzxc terms
@@ -1475,7 +1485,7 @@ Also machine-dependent error correction here?
       }
 %%
     \WPtask[\label{task:opt-machine}]{Model-guided optimisation 
-      (M21--M36; Responsible: 5; Involved: 1,2,3)}{%
+      (M21--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}{%
       Develop procedures to optimise \zx-terms subject to a machine
       model,  within the confines of
       an annotation system for a particular hardware platform
@@ -1513,22 +1523,22 @@ Staton, Carette.}
   \end{WPaim}
   \begin{WPtasks}
     \WPtask[\label{task:admin}]{Project administration (M1--M36;
-      responsible 1; involved 2,3,4,5)}{Global administration and
+      responsible \partnerref{partner:grenoble}; involved \partnerref{partner:loria},\partnerref{partner:oxford},\partnerref{partner:CQC},\partnerref{partner:gdansk})}{Global administration and
       project coordination.}
     \WPtask[\label{task:website}]{Creation and maintenance of project
-      website (M1--M36; responsible 1; involved 2,3,4,5)}{As part of
+      website (M1--M36; responsible \partnerref{partner:grenoble}; involved \partnerref{partner:loria},\partnerref{partner:oxford},\partnerref{partner:CQC},\partnerref{partner:gdansk})}{As part of
       our commitment to open science, we will create and maintain a
       unified website for the project, including latest scientific
       works, downloadable software, end-user documentation, and
       popularising articles aimed at a general audience.}
     \WPtask[\label{task:wkshopone}]{Kick off meeting (M1--M2;
-      responsible 2; involved 1)}{Project workshop to define
+      responsible \partnerref{partner:loria}; involved \partnerref{partner:grenoble})}{Project workshop to define
       state of the art, establish plans for the next year.}
     \WPtask[\label{task:wkshoptwo}]{Midpoint meeting (M17--M18;
-      responsible 5; involved 1)}{Project workshop to disseminate
+      responsible \partnerref{partner:gdansk}; involved \partnerref{partner:grenoble})}{Project workshop to disseminate
       initial results, evaluate progress and determine next steps.}
     \WPtask[\label{task:wkshopthree}]{Final meeting and school (M33--M36;
-      responsible 3; involved 1,5)}{Project workshop and school to disseminate
+      responsible \partnerref{partner:oxford}; involved \partnerref{partner:grenoble},\partnerref{partner:gdansk})}{Project workshop and school to disseminate
       project results.}
   \end{WPtasks}
   \begin{WPdeliverables}
@@ -1826,6 +1836,7 @@ Concretely, the most important aspect is the fact that the modular architecture
 \subsection{Description of the consortium \REM{(1 page each)}}
 \label{sec:descr-cons}
 
+\newcounter{partners}
 \REM{Describe expertise and role in the project for each partner
   (templates provided). The information provided here will be used to
   judge the operational capacity. Use the following templates for the
@@ -1833,7 +1844,7 @@ Concretely, the most important aspect is the fact that the modular architecture
   requesting funding if any. If the project relies on input to be
   provided by a third party, append a letter of commitment at the end
   of the proposal}
- 
+
 %%%% Grenoble
 \fbox{
   \begin{minipage}{1.0\linewidth}
@@ -1841,6 +1852,7 @@ Concretely, the most important aspect is the fact that the modular architecture
       \textbf{Partner 1} & University of Grenoble\\
       Project Coordinator & Laboratoire Informatique de Grenoble    \end{tabular}
     \vspace{1mm}\hrulefill\vspace{1mm}
+\refstepcounter{partners}\label{partner:grenoble}
 
     \textbf{Expertise:}
 
@@ -1870,6 +1882,7 @@ brings expertise in devices large scale fabrication and characterization (DCOS d
 
 \newpage
 %%%% LORIA + LRI
+
 \fbox{
   \begin{minipage}{1.0\linewidth}
     \begin{tabular}{p{0.4\linewidth}|p{0.6\linewidth}}
@@ -1877,11 +1890,17 @@ brings expertise in devices large scale fabrication and characterization (DCOS d
        & LORIA (UMR 7503) \\
        & LRI (UMR 8623) ({\small Universit\'e Paris-Sud / CNRS })
     \end{tabular}
+\refstepcounter{partners}\label{partner:loria}
     \vspace{1mm}\hrulefill\vspace{1mm}
 
     \textbf{Expertise:}
-    LORIA (UMR 7503) is a research unit common to the CNRS, the University of Lorraine and Inria. % -- is the French acronym for the "Lorraine Research Laboratory in Computer Science and its Applications".
-     Its missions mainly deal with fundamental and applied research in computer sciences. Bolstered by the 500 people working in the lab, LORIA is today one of the biggest research units in Lorraine, and one of the biggest computer science labs in France.
+    LORIA % (UMR 7503)
+    is a research unit common to the CNRS, the University of Lorraine and Inria. % -- is the French acronym for the "Lorraine Research Laboratory in Computer Science and its Applications".
+     Its missions mainly deal with fundamental and applied research in
+     computer sciences. Bolstered by the 500 people working in the
+     lab, LORIA is today one of the %
+     %biggest research units in Lorraine, and one of the
+     biggest computer science labs in France.
     The Inria project team Mocqua, led by Prof. Emmanuel Jeandel is expert in models of quantum computation, quantum information theory and in particular \zx-calculus. 
     
   % Beno\^it Valiron (Assistant Prof. CentraleSup\'elec / LRI) will be associated with 
@@ -1894,7 +1913,7 @@ brings expertise in devices large scale fabrication and characterization (DCOS d
 %      (incl. widely-used datasets or software), or other achievements
 %      relevant to the call content.  }
 
-    \textbf{Simon Perdrix} is researcher at CNRS (CR1), having previously held positions at LIG (Grenoble) as a charge de recherche, and at OUCS (Oxford), LFCS (Edinburgh) and PPS (Paris) as Postdoc. He is an expert of \zx-calculus introducing several new axioms to the language (1,2,3).  He is also an expert of measurement-based quantum computing, introducing in particular a graphical characterisation of determinism in the model (4,5). He leads the Quantum Computation French network (GT IQ at CNRS GdR IM) and is board of the CNRS Quantum Technology network (GdR IQFA). %He has been PI of several projects (PEPS, Region Lorraine), and led work-packages in ANR and EU STREP projects. In 2016, he has been elected scientific secretary of section 6 at CoNRS. Section 6 is in charge, among other expertise duties, of hiring, promoting, and evaluating CNRS researchers in computer science.
+    \textbf{Simon Perdrix} is researcher at CNRS having previously held positions at LIG (Grenoble) as a charge de recherche, and at OUCS (Oxford), LFCS (Edinburgh) and PPS (Paris) as Postdoc. He is an expert of \zx-calculus introducing several new axioms to the language (1,2,3).  He is also an expert of measurement-based quantum computing, introducing in particular a graphical characterisation of determinism in the model (4,5). He leads the Quantum Computation French network (GT IQ at CNRS GdR IM) and is board of the CNRS Quantum Technology network (GdR IQFA). %He has been PI of several projects (PEPS, Region Lorraine), and led work-packages in ANR and EU STREP projects. In 2016, he has been elected scientific secretary of section 6 at CoNRS. Section 6 is in charge, among other expertise duties, of hiring, promoting, and evaluating CNRS researchers in computer science.
     \textit{\color{gray} \textbf{Publications:} (1) R. Duncan and ---. Graph states and the necessity of Euler decomposition. In CiE 2009, Springer LNCS 5635. (2) --- and Q. Wang. Supplementarity is Necessary for Quantum Diagram Reasoning. In MFCS 2016. LIPIcs, Dagstuhl, Germany, 2016. (3) R. Duncan and ---. Rewriting measurement-based quantum computations with generalised flow. In ICALP 2010, Springer LNCS 6199. (4) D. E. Browne, E. Kashefi, M. Mhalla, and ---. Generalized flow and determinism in measurement-based quantum computation. New J. Phys, 9(250), 2007. (5) M. Mhalla and ---. Finding optimal flows efficiently. In Automata, Languages and Programming, In ICALP 2008, Springer LNCS 5125.}
 
     %\medskip
@@ -1903,7 +1922,7 @@ brings expertise in devices large scale fabrication and characterization (DCOS d
     Lorraine, leader of the Inria project team Mocqua. He did a PhD in
     quantum computing, he is also an expert in dynamical systems (tiling, cellular automata). He contributed to the development of the \zx-calculus (2) %(cyclotomic supplementarity) 
     and, together with Simon Perdrix and Renaud Vilmart, also at LORIA, they recently proved the completeness of the \zx-calculus for a universal Clifford+T fragment of quantum mechanics (3).
-    \textit{\color{gray} \textbf{Publications:} (1) ---. Universality in Quantum Computation. In ICALP 2004, Springer LNCS 3142. (2) ---, S. Perdrix, R. Vilmart, and Q. Wang. ZX-calculus: Cyclotomic supplementarity and incompleteness for Clifford+T quantum mechanics. MFCS 2017. (3) ---, S. Perdrix, and R. Vilmart. A complete axiomatisation of the ZX-calculus for Clifford+T quantum mechanics. arXiv:1705.11151, 2017.}
+    \textit{\color{gray} \textbf{Publications:} (1) ---. Universality in Quantum Computation. In ICALP 2004, Springer LNCS 3142. (2) ---, S. Perdrix, R. Vilmart, and Q. Wang. ZX-calculus: Cyclotomic supplementarity and incompleteness for Clifford+T quantum mechanics. MFCS 2017. (3) ---, S. Perdrix, and R. Vilmart. A complete axiomatisation of the ZX-calculus for Clifford+T quantum mechanics. LICS, 2018.}
 
     %\medskip
     
@@ -1915,16 +1934,23 @@ brings expertise in devices large scale fabrication and characterization (DCOS d
     is also included within the LORIA site.
     He obtained his Ph.D. In Mathematics at the University of Ottawa (Canada) in 2008. He is currently assistant professor at CentraleSup\'elec and researcher at LRI (laboratoire de recherche en informatique), Orsay. His research topics on interests include quantum computation, semantics of programming languages and models of computations, he is in particular co-inventor of the Quipper language.  %He authored 8 journal articles, 1 book chapter and 11 international workshop and conference papers. He is currently co-supervising 1 Ph.D. Student.  
     \textit{\color{gray} \textbf{Publications:} (1) A. S. Green, P. L. Lumsdaine, N. J. Ross, P. Selinger, and ---. Quipper: A scalable quantum programming language. PLDI 2013.
-    (2) A. Scherer, ---, S.-C. Mau, Scott Alexander, E. van den Berg and T. E. Chapuran. Concrete resource analysis of the quantum linear-system algorithm used to compute the electromagnetic scattering cross section of a 2D target. Quantum Information Processing 16:60, 2017
-    (3) ---, N. J. Ross, P. Selinger, D. S. Alexander and Jonathan M. Smith. Programming the Quantum Future. Communications of the ACM, Vol. 58 No. 8, 2015.
+    (2) A. Scherer, ---, S.-C. Mau, Scott Alexander, E. van den Berg and T. E. Chapuran. Concrete resource analysis of the quantum linear-system algorithm used to compute the electromagnetic scattering cross section of a 2D target. Quantum Information Processing 2017
+    (3) ---, N. J. Ross, P. Selinger, D. S. Alexander and Jonathan M. Smith. Programming the Quantum Future. Communications of the ACM, 2015.
     (4) M. Pagani, P. Selinger, ---. Applying quantitative semantics to higher-order quantum computing. In POPL 2014.} 
 
     %\medskip 
 
 % \textbf{Renaud Vilmart}, PhD student supervised by E. Jeandel and S. Perdrix, has greatly contributed to make the \zx-calculus complete for Clifford+T quantum mechanics.
     
-    \vspace{1mm}\hrulefill\vspace{1mm}
+\hrulefill
+
 
+    \emph{Note that LORIA and LRI are administratively two different
+      partners. For logistic and scientific reasons, they are grouped
+      together in the presentation of the project.}
+    
+\hrulefill
+    
     \textbf{Role in Project:} LORIA will develop the front-end compilation of HLLs into \dzxc terms.
     As one of the main contributors to the \zxcalculus and expert of 1WQC, LORIA will also play a key role in the development of \dzxc taking into account the different models of computation.
     The site provides expertise both in quantum programming
@@ -1937,6 +1963,7 @@ brings expertise in devices large scale fabrication and characterization (DCOS d
 
 \newpage
 %%%% Oxford
+
 \fbox{
   \begin{minipage}{1.0\linewidth}
     \begin{tabular}{p{0.4\linewidth}|p{0.6\linewidth}}
@@ -1944,6 +1971,7 @@ brings expertise in devices large scale fabrication and characterization (DCOS d
        & Department of Computer Science
     \end{tabular}
     \vspace{1mm}\hrulefill\vspace{1mm} 
+\refstepcounter{partners}\label{partner:oxford}
 
     \textbf{Expertise:} The now well over 50 members Quantum Group at the Department of Computer Science, founded and  led by Abramsky and Coecke has been the world-leading group in the development of high-level computer science methods for quantum computing. It is also the birthplace of \zxcalculus, where most of the completeness result were proven, and where {\tt quantomatic} was mostly developed.  Previously they coordinated the FP6 FET  Open STREP QICS. The group is part of the NQIT Quantum Technologies Hub and has hosted 8 long-term EPSRC fellowships in the area of Quantum Computing. For a year now the group has an ongoing collaboration with Cambridge Quantum Computing Ltd. The Computer Science Department at Oxford is currently ranked 1st in the world.  
         
@@ -2012,12 +2040,14 @@ As the group where \zxcalculus\  originated \cite{Coecke:2009aa}, Oxford will co
 
 \newpage
 %%%% CQC
+
 \fbox{
   \begin{minipage}{1.0\linewidth}
     \begin{tabular}{p{0.4\linewidth}|p{0.6\linewidth}}
       \textbf{Partner 4} & CQC\\
        & Cambridge Quantum Computing Ltd.
     \end{tabular}
+\refstepcounter{partners}\label{partner:CQC}
     \vspace{1mm}\hrulefill\vspace{1mm}
 
     \textbf{Expertise:} Founded in 2014, Cambridge Quantum Computing
@@ -2097,12 +2127,14 @@ As the group where \zxcalculus\  originated \cite{Coecke:2009aa}, Oxford will co
 
 \newpage%\TODOb{It should be prominently indicated that before the start of the project new team member will be hired who will also contribute, possible by list as member "postdoc TBA", "senior postdoc TBS" etc.}
 %%% Gdansk
+
 \fbox{
   \begin{minipage}{1.0\linewidth}
     \begin{tabular}{p{0.4\linewidth}|p{0.6\linewidth}}
       \textbf{Partner 5} & University of Gdansk\\
        & International Centre for Theory of Quantum Technologies
     \end{tabular}
+\refstepcounter{partners}\label{partner:gdansk}
     \vspace{1mm}\hrulefill\vspace{1mm}
     
     \textbf{Expertise:} The International Centre for Theory of Quantum Technologies (ICTQT) is a newly created research institute, funded by the Foundation for Polish Science, and hosted by the University of Gdansk, which is the pioneering and leading center of quantum information research in Poland. The founders of ICTQT are Marek Zukowski as the director, and Pawel Horodecki as a co-applicant, and the Centre's official foreign partner is IQOQI-Vienna of the Austrian Academy of Sciences. ICTQT aims to address the central theoretical problems of quantum technologies, with emphasis on communication methods and quantum computation. The Centre consists of 7 groups, which cover different aspects of quantum resources, quantum computation and quantum cybersecurity. ICTQT hosts leading experts in the field, including M. Horodecki and M. Pawlowski. The Centre harnesses the knowledge and skills of established researchers with strong track records on quantum information theory and the foundations of quantum mechanics, and combines it with the drive and vision of young researchers. Research highlights of the members of ICTQT include the development of (i) quantum entanglement detection and quantification, (ii) quantum security beyond pure entanglement, (iii) device-independent quantum cryptographic protocols (iv) topological self-correcting memories for quantum computing, and (v) contextuality as a resource for one-way communication. 
@@ -2124,12 +2156,14 @@ ICTQT will develop the foundational aspects of ZX. The expertise of Dr.~Sainz on
  
 \newpage
 %%% Radboud Nijmegen
+
 \fbox{
   \begin{minipage}{1.0\linewidth}
     \begin{tabular}{p{0.4\linewidth}|p{0.6\linewidth}}
       \textbf{Partner 6} & Radboud Universiteit Nijmegen\\
        & Institute for Computing and Information Sciences
     \end{tabular}
+\refstepcounter{partners}\label{partner:radboud}
     \vspace{1mm}\hrulefill\vspace{1mm}
 
     \textbf{Expertise:} Situated within the largest digital security group in the Netherlands (50+ members), the Radboud Quantum Group offers strong expertise in the formal mathematical structures underpinning both quantum theory and classical programming languages. It consists of two full-time academics, one postdoc, and two PhD students. The Quantum Group furthermore maintains active relationships with the security group as a whole, including prominent members of the classical and post-quantum cryptography communities (e.g.~Joan Daemen, co-author of the renowned AES cipher; and Peter Schwabe, whose post-quantum key exchange protocol NewHope was recently trialled by Google\footnote{Nick Stratt. Google is working to safeguard chrome from quantum computers. The Verge, July 2016.}).
diff --git a/NEWPROPOSAL/finances/QuantERA_Call_2019_-_Financial_Form_Nancy.xlsx b/NEWPROPOSAL/finances/QuantERA_Call_2019_-_Financial_Form_Nancy.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..1194c6127bd473d475e390ab46e639ddcc9da59c
Binary files /dev/null and b/NEWPROPOSAL/finances/QuantERA_Call_2019_-_Financial_Form_Nancy.xlsx differ