diff --git a/NEWPROPOSAL/FULLPROP.tex b/NEWPROPOSAL/FULLPROP.tex
index c47d3dd7f38cf97cdb2af0a0f6bee0530928ed99..f8e24c918814e5c5f5725c6a04f0dec4fa0ad62a 100644
--- a/NEWPROPOSAL/FULLPROP.tex
+++ b/NEWPROPOSAL/FULLPROP.tex
@@ -1248,7 +1248,7 @@ collaboration is a strong point of this project.
     \ref{task:betterboxes}.
     %
   }
-  \WPtask[\label{task:testBench}]{Open test-suite (M3--M36;
+  \WPtask[\label{task:testBench}]{Open test-suite (M6--M36;
     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.
@@ -1258,7 +1258,7 @@ Devise test-suite of concrete instances of circuits and
     %
   }
   \WPtask[\label{task:circuit-model}]{Idealised quantum circuits
-    (M1--M9; Responsible \partnerref{partner:loria}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:CQC})}{%
+    (M1--M12; 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
@@ -1266,7 +1266,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 \partnerref{partner:loria}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford})}{%
+    1-Way Quantum Computation (M1--M15; Responsible \partnerref{partner:loria}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford})}{%
     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
diff --git a/NEWPROPOSAL/ganttchart.tex b/NEWPROPOSAL/ganttchart.tex
index e1b18f0e4d32524b29189fa0b4cdcd4ea367aa37..8dcec0657e1e4ee19089d8559bedfcde53b63641 100644
--- a/NEWPROPOSAL/ganttchart.tex
+++ b/NEWPROPOSAL/ganttchart.tex
@@ -28,12 +28,12 @@
   \\
 %%%% WP 1 
   \ganttset{bar/.append style={fill=red!50}}
-  \ganttbar{\ref{task:HHL} HLL $\to$ \azx}{1}{36}\\
+  \ganttbar{\ref{task:HHL} HLL $\to$ \azx}{3}{36}\\
   \ganttbar{\ref{task:trans1} Front-end API}{1}{36}\\
   \ganttbar{\ref{task:testBench} Test Suite}{6}{36}\\
   \ganttbar{\ref{task:circuit-model} Circuit model}{1}{12}\\
   \ganttbar{\ref{task:mbqc-model} 1WQC model}{1}{15}\\
-  \ganttbar{\ref{task:backendapi} Back-end API}{33}{36}\\
+  \ganttbar{\ref{task:backendapi} Back-end API}{24}{36}\\
 %%%% WP 2
   \ganttset{bar/.append style={fill=yellow}}
   \ganttbar{\ref{task:axioms} Beyond qubits}{1}{14}\\
@@ -47,16 +47,16 @@
 %%%% WP 3 
   \ganttset{bar/.append style={fill=green!50}}
   \ganttbar{\ref{task:algorithms} Algorithms for \azx}{1}{24}\\
-  \ganttbar{\ref{task:annotate1} Topology and causality}{13}{24}\\
+  \ganttbar{\ref{task:annotate1} Topology and causality}{1}{18}\\
   \ganttbar{\ref{task:annotate2} Quantitative properties}{13}{24}\\ 
-  \ganttbar{\ref{task:basic-opt} Model-independent optimisations}{13}{24}\\
+  \ganttbar{\ref{task:basic-opt} Model-independent optimisations}{12}{24}\\
   \ganttbar{\ref{task:ECC} Error Correction}{1}{24}\\
 %%% WP 4
   \ganttset{bar/.append style={fill=blue!50}}
   \ganttbar{\ref{task:qdot-model} Quantum dot model}{13}{36}\\
-  \ganttbar{\ref{task:NQIT-model} NQIT model}{13}{36}\\
-  \ganttbar{\ref{task:runnable} Execution layout}{16}{30}\\
-  \ganttbar{\ref{task:opt-machine} Model-guided optimisations}{22}{36}\\
+  \ganttbar{\ref{task:NQIT-model} NQIT model}{13}{30}\\
+  \ganttbar{\ref{task:runnable} Execution layout}{15}{30}\\
+  \ganttbar{\ref{task:opt-machine} Model-guided optimisations}{21}{36}\\
 %%% WP 5 -- don't use
   % \ganttset{bar/.append style={fill=gray!50}}
   % \ganttbar{\ref{task:admin} \REM{Title}{1}{36}