Regenerate code

21 files changed, 3000 insertions, 3045 deletions

diff --git a/ML_BSSN_O8/interface.ccl b/ML_BSSN_O8/interface.ccl
index e584e78..738701f 100644
--- a/ML_BSSN_O8/interface.ccl
+++ b/ML_BSSN_O8/interface.ccl
@@ -8,7 +8,6 @@ inherits:   ADMBase TmunuBase Grid GenericFD Boundary
 
 USES INCLUDE: GenericFD.h
 USES INCLUDE: Symmetry.h
-USES INCLUDE: Vectors.hh
 USES INCLUDE: sbp_calc_coeffs.h
 USES INCLUDE: Boundary.h
 USES INCLUDE: loopcontrol.h
diff --git a/ML_BSSN_O8/src/Differencing.h b/ML_BSSN_O8/src/Differencing.h
index 74b2508..450d07a 100644
--- a/ML_BSSN_O8/src/Differencing.h
+++ b/ML_BSSN_O8/src/Differencing.h
@@ -1,27 +1,27 @@
-#define PDstandardNth1(u,i,j,k) (p1o840dx*(-672*vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(0)]) + 672*vec_loadu((u)[index+di*(1)+dj*(0)+dk*(0)]) + 168*vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(0)]) - 168*vec_loadu((u)[index+di*(2)+dj*(0)+dk*(0)]) - 32*vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(0)]) + 32*vec_loadu((u)[index+di*(3)+dj*(0)+dk*(0)]) + 3*vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(0)]) - 3*vec_loadu((u)[index+di*(4)+dj*(0)+dk*(0)])))
-#define PDstandardNth2(u,i,j,k) (p1o840dy*(-672*vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(0)]) + 672*vec_loadu((u)[index+di*(0)+dj*(1)+dk*(0)]) + 168*vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(0)]) - 168*vec_loadu((u)[index+di*(0)+dj*(2)+dk*(0)]) - 32*vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(0)]) + 32*vec_loadu((u)[index+di*(0)+dj*(3)+dk*(0)]) + 3*vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(0)]) - 3*vec_loadu((u)[index+di*(0)+dj*(4)+dk*(0)])))
-#define PDstandardNth3(u,i,j,k) (p1o840dz*(-672*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-1)]) + 672*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(1)]) + 168*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-2)]) - 168*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(2)]) - 32*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-3)]) + 32*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(3)]) + 3*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-4)]) - 3*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(4)])))
-#define PDstandardNth11(u,i,j,k) (p1o5040dx2*(-14350*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 8064*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(0)])) - 1008*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(0)])) + 128*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(0)])) - 9*(vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(0)]))))
-#define PDstandardNth22(u,i,j,k) (p1o5040dy2*(-14350*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 8064*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(0)])) - 1008*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(0)])) + 128*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(0)])) - 9*(vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(0)]))))
-#define PDstandardNth33(u,i,j,k) (p1o5040dz2*(-14350*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 8064*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(1)])) - 1008*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(2)])) + 128*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(3)])) - 9*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(4)]))))
-#define PDstandardNth12(u,i,j,k) (p1o705600dxdy*(-451584*(vec_loadu((u)[index+di*(-1)+dj*(1)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(-1)+dk*(0)])) + 451584*(vec_loadu((u)[index+di*(-1)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(1)+dk*(0)])) + 112896*(vec_loadu((u)[index+di*(-1)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(-2)+dj*(1)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(-1)+dk*(0)])) - 112896*(vec_loadu((u)[index+di*(-1)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(-2)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(1)+dk*(0)])) - 28224*(vec_loadu((u)[index+di*(-2)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(-2)+dk*(0)])) + 28224*(vec_loadu((u)[index+di*(-2)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(2)+dk*(0)])) - 21504*(vec_loadu((u)[index+di*(-1)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(-3)+dj*(1)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(-1)+dk*(0)])) + 21504*(vec_loadu((u)[index+di*(-1)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(-3)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(1)+dk*(0)])) + 5376*(vec_loadu((u)[index+di*(-2)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(-3)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(-2)+dk*(0)])) - 5376*(vec_loadu((u)[index+di*(-2)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(-3)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(2)+dk*(0)])) - 1024*(vec_loadu((u)[index+di*(-3)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(-3)+dk*(0)])) + 1024*(vec_loadu((u)[index+di*(-3)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(3)+dk*(0)])) + 2016*(vec_loadu((u)[index+di*(-1)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(1)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(-1)+dk*(0)])) - 2016*(vec_loadu((u)[index+di*(-1)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(1)+dk*(0)])) - 504*(vec_loadu((u)[index+di*(-2)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(-2)+dk*(0)])) + 504*(vec_loadu((u)[index+di*(-2)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(2)+dk*(0)])) + 96*(vec_loadu((u)[index+di*(-3)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(-3)+dk*(0)])) - 96*(vec_loadu((u)[index+di*(-3)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(3)+dk*(0)])) - 9*(vec_loadu((u)[index+di*(-4)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(-4)+dk*(0)])) + 9*(vec_loadu((u)[index+di*(-4)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(4)+dk*(0)]))))
-#define PDstandardNth13(u,i,j,k) (p1o705600dxdz*(-451584*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(1)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(-1)])) + 451584*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(1)])) + 112896*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(1)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(-1)])) - 112896*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(1)])) - 28224*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(-2)])) + 28224*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(2)])) - 21504*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(1)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(-1)])) + 21504*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(1)])) + 5376*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(-2)])) - 5376*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(2)])) - 1024*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(-3)])) + 1024*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(3)])) + 2016*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(1)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(-1)])) - 2016*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(1)])) - 504*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(-2)])) + 504*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(2)])) + 96*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(-3)])) - 96*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(3)])) - 9*(vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(-4)])) + 9*(vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(4)]))))
-#define PDstandardNth21(u,i,j,k) (p1o705600dxdy*(-451584*(vec_loadu((u)[index+di*(-1)+dj*(1)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(-1)+dk*(0)])) + 451584*(vec_loadu((u)[index+di*(-1)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(1)+dk*(0)])) + 112896*(vec_loadu((u)[index+di*(-1)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(-2)+dj*(1)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(-1)+dk*(0)])) - 112896*(vec_loadu((u)[index+di*(-1)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(-2)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(1)+dk*(0)])) - 28224*(vec_loadu((u)[index+di*(-2)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(-2)+dk*(0)])) + 28224*(vec_loadu((u)[index+di*(-2)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(2)+dk*(0)])) - 21504*(vec_loadu((u)[index+di*(-1)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(-3)+dj*(1)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(-1)+dk*(0)])) + 21504*(vec_loadu((u)[index+di*(-1)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(-3)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(1)+dk*(0)])) + 5376*(vec_loadu((u)[index+di*(-2)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(-3)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(-2)+dk*(0)])) - 5376*(vec_loadu((u)[index+di*(-2)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(-3)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(2)+dk*(0)])) - 1024*(vec_loadu((u)[index+di*(-3)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(-3)+dk*(0)])) + 1024*(vec_loadu((u)[index+di*(-3)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(3)+dk*(0)])) + 2016*(vec_loadu((u)[index+di*(-1)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(1)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(-1)+dk*(0)])) - 2016*(vec_loadu((u)[index+di*(-1)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(1)+dk*(0)])) - 504*(vec_loadu((u)[index+di*(-2)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(2)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(-2)+dk*(0)])) + 504*(vec_loadu((u)[index+di*(-2)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(2)+dk*(0)])) + 96*(vec_loadu((u)[index+di*(-3)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(3)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(-3)+dk*(0)])) - 96*(vec_loadu((u)[index+di*(-3)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(-4)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(3)+dk*(0)])) - 9*(vec_loadu((u)[index+di*(-4)+dj*(4)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(-4)+dk*(0)])) + 9*(vec_loadu((u)[index+di*(-4)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(4)+dk*(0)]))))
-#define PDstandardNth23(u,i,j,k) (p1o705600dydz*(-451584*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(1)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(-1)])) + 451584*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(1)])) + 112896*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(1)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(-1)])) - 112896*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(1)])) - 28224*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(-2)])) + 28224*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(2)])) - 21504*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(1)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(-1)])) + 21504*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(1)])) + 5376*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(-2)])) - 5376*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(2)])) - 1024*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(-3)])) + 1024*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(3)])) + 2016*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(1)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(-1)])) - 2016*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(1)])) - 504*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(-2)])) + 504*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(2)])) + 96*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(-3)])) - 96*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(3)])) - 9*(vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(-4)])) + 9*(vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(4)]))))
-#define PDstandardNth31(u,i,j,k) (p1o705600dxdz*(-451584*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(1)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(-1)])) + 451584*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(1)])) + 112896*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(1)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(-1)])) - 112896*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(1)])) - 28224*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(-2)])) + 28224*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(2)])) - 21504*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(1)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(-1)])) + 21504*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(1)])) + 5376*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(-2)])) - 5376*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(2)])) - 1024*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(-3)])) + 1024*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(3)])) + 2016*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(1)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(-1)])) - 2016*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(1)])) - 504*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(2)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(-2)])) + 504*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(2)])) + 96*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(3)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(-3)])) - 96*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(3)])) - 9*(vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(4)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(-4)])) + 9*(vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(4)]))))
-#define PDstandardNth32(u,i,j,k) (p1o705600dydz*(-451584*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(1)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(-1)])) + 451584*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(1)])) + 112896*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(1)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(-1)])) - 112896*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(1)])) - 28224*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(-2)])) + 28224*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(2)])) - 21504*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(1)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(-1)])) + 21504*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(1)])) + 5376*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(-2)])) - 5376*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(2)])) - 1024*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(-3)])) + 1024*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(3)])) + 2016*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(1)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(-1)])) - 2016*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(1)])) - 504*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(2)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(-2)])) + 504*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(2)])) + 96*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(3)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(-3)])) - 96*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(3)])) - 9*(vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(4)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(-4)])) + 9*(vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(4)]))))
-#define PDdissipationNth1(u,i,j,k) (p1o1024dx*(-252*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 210*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(0)])) - 120*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(0)])) + 45*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(0)])) - 10*(vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(0)])) + vec_loadu((u)[index+di*(-5)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(5)+dj*(0)+dk*(0)])))
-#define PDdissipationNth2(u,i,j,k) (p1o1024dy*(-252*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 210*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(0)])) - 120*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(0)])) + 45*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(0)])) - 10*(vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(0)])) + vec_loadu((u)[index+di*(0)+dj*(-5)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(5)+dk*(0)])))
-#define PDdissipationNth3(u,i,j,k) (p1o1024dz*(-252*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 210*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(1)])) - 120*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(2)])) + 45*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(3)])) - 10*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(4)])) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-5)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(5)])))
-#define PDupwindNth1(u,i,j,k) (pm1o840dx*(378*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) - 60*vec_loadu((u)[index+di*(-2*dir1)+dj*(0)+dk*(0)]) + 5*vec_loadu((u)[index+di*(-3*dir1)+dj*(0)+dk*(0)]) - 140*vec_loadu((u)[index+di*(3*dir1)+dj*(0)+dk*(0)]) + 30*vec_loadu((u)[index+di*(4*dir1)+dj*(0)+dk*(0)]) - 3*vec_loadu((u)[index+di*(5*dir1)+dj*(0)+dk*(0)]) + 420*(vec_loadu((u)[index+di*(2*dir1)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(-dir1)+dj*(0)+dk*(0)])) - 1050*vec_loadu((u)[index+di*(dir1)+dj*(0)+dk*(0)]))*dir1)
-#define PDupwindNth2(u,i,j,k) (pm1o840dy*(378*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) - 60*vec_loadu((u)[index+di*(0)+dj*(-2*dir2)+dk*(0)]) + 5*vec_loadu((u)[index+di*(0)+dj*(-3*dir2)+dk*(0)]) - 140*vec_loadu((u)[index+di*(0)+dj*(3*dir2)+dk*(0)]) + 30*vec_loadu((u)[index+di*(0)+dj*(4*dir2)+dk*(0)]) - 3*vec_loadu((u)[index+di*(0)+dj*(5*dir2)+dk*(0)]) + 420*(vec_loadu((u)[index+di*(0)+dj*(2*dir2)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(-dir2)+dk*(0)])) - 1050*vec_loadu((u)[index+di*(0)+dj*(dir2)+dk*(0)]))*dir2)
-#define PDupwindNth3(u,i,j,k) (pm1o840dz*(378*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) - 60*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-2*dir3)]) + 5*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-3*dir3)]) - 140*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(3*dir3)]) + 30*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(4*dir3)]) - 3*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(5*dir3)]) + 420*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(2*dir3)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-dir3)])) - 1050*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(dir3)]))*dir3)
-#define PDonesided1(u,i,j,k) (p1odx*(-vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(dir1)+dj*(0)+dk*(0)]))*dir1)
-#define PDonesided2(u,i,j,k) (p1ody*(-vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(dir2)+dk*(0)]))*dir2)
-#define PDonesided3(u,i,j,k) (p1odz*(-vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(dir3)]))*dir3)
-#define PDupwindNthAnti1(u,i,j,k) (p1o1680dx*(-1470*vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(0)]) + 1470*vec_loadu((u)[index+di*(1)+dj*(0)+dk*(0)]) + 480*vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(0)]) - 480*vec_loadu((u)[index+di*(2)+dj*(0)+dk*(0)]) - 145*vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(0)]) + 145*vec_loadu((u)[index+di*(3)+dj*(0)+dk*(0)]) + 30*vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(0)]) - 30*vec_loadu((u)[index+di*(4)+dj*(0)+dk*(0)]) - 3*vec_loadu((u)[index+di*(-5)+dj*(0)+dk*(0)]) + 3*vec_loadu((u)[index+di*(5)+dj*(0)+dk*(0)])))
-#define PDupwindNthSymm1(u,i,j,k) (p1o560dx*(-252*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 210*(vec_loadu((u)[index+di*(-1)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(1)+dj*(0)+dk*(0)])) - 120*(vec_loadu((u)[index+di*(-2)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(2)+dj*(0)+dk*(0)])) + 45*(vec_loadu((u)[index+di*(-3)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(3)+dj*(0)+dk*(0)])) - 10*(vec_loadu((u)[index+di*(-4)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(4)+dj*(0)+dk*(0)])) + vec_loadu((u)[index+di*(-5)+dj*(0)+dk*(0)]) + vec_loadu((u)[index+di*(5)+dj*(0)+dk*(0)])))
-#define PDupwindNthAnti2(u,i,j,k) (p1o1680dy*(-1470*vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(0)]) + 1470*vec_loadu((u)[index+di*(0)+dj*(1)+dk*(0)]) + 480*vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(0)]) - 480*vec_loadu((u)[index+di*(0)+dj*(2)+dk*(0)]) - 145*vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(0)]) + 145*vec_loadu((u)[index+di*(0)+dj*(3)+dk*(0)]) + 30*vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(0)]) - 30*vec_loadu((u)[index+di*(0)+dj*(4)+dk*(0)]) - 3*vec_loadu((u)[index+di*(0)+dj*(-5)+dk*(0)]) + 3*vec_loadu((u)[index+di*(0)+dj*(5)+dk*(0)])))
-#define PDupwindNthSymm2(u,i,j,k) (p1o560dy*(-252*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 210*(vec_loadu((u)[index+di*(0)+dj*(-1)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(1)+dk*(0)])) - 120*(vec_loadu((u)[index+di*(0)+dj*(-2)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(2)+dk*(0)])) + 45*(vec_loadu((u)[index+di*(0)+dj*(-3)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(3)+dk*(0)])) - 10*(vec_loadu((u)[index+di*(0)+dj*(-4)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(4)+dk*(0)])) + vec_loadu((u)[index+di*(0)+dj*(-5)+dk*(0)]) + vec_loadu((u)[index+di*(0)+dj*(5)+dk*(0)])))
-#define PDupwindNthAnti3(u,i,j,k) (p1o1680dz*(-1470*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-1)]) + 1470*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(1)]) + 480*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-2)]) - 480*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(2)]) - 145*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-3)]) + 145*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(3)]) + 30*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-4)]) - 30*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(4)]) - 3*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-5)]) + 3*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(5)])))
-#define PDupwindNthSymm3(u,i,j,k) (p1o560dz*(-252*vec_loadu((u)[index+di*(0)+dj*(0)+dk*(0)]) + 210*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-1)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(1)])) - 120*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-2)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(2)])) + 45*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-3)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(3)])) - 10*(vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-4)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(4)])) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(-5)]) + vec_loadu((u)[index+di*(0)+dj*(0)+dk*(5)])))
+#define PDstandardNth1(u,i,j,k) (p1o840dx*(-672*(u)[index+di*(-1)+dj*(0)+dk*(0)] + 672*(u)[index+di*(1)+dj*(0)+dk*(0)] + 168*(u)[index+di*(-2)+dj*(0)+dk*(0)] - 168*(u)[index+di*(2)+dj*(0)+dk*(0)] - 32*(u)[index+di*(-3)+dj*(0)+dk*(0)] + 32*(u)[index+di*(3)+dj*(0)+dk*(0)] + 3*(u)[index+di*(-4)+dj*(0)+dk*(0)] - 3*(u)[index+di*(4)+dj*(0)+dk*(0)]))
+#define PDstandardNth2(u,i,j,k) (p1o840dy*(-672*(u)[index+di*(0)+dj*(-1)+dk*(0)] + 672*(u)[index+di*(0)+dj*(1)+dk*(0)] + 168*(u)[index+di*(0)+dj*(-2)+dk*(0)] - 168*(u)[index+di*(0)+dj*(2)+dk*(0)] - 32*(u)[index+di*(0)+dj*(-3)+dk*(0)] + 32*(u)[index+di*(0)+dj*(3)+dk*(0)] + 3*(u)[index+di*(0)+dj*(-4)+dk*(0)] - 3*(u)[index+di*(0)+dj*(4)+dk*(0)]))
+#define PDstandardNth3(u,i,j,k) (p1o840dz*(-672*(u)[index+di*(0)+dj*(0)+dk*(-1)] + 672*(u)[index+di*(0)+dj*(0)+dk*(1)] + 168*(u)[index+di*(0)+dj*(0)+dk*(-2)] - 168*(u)[index+di*(0)+dj*(0)+dk*(2)] - 32*(u)[index+di*(0)+dj*(0)+dk*(-3)] + 32*(u)[index+di*(0)+dj*(0)+dk*(3)] + 3*(u)[index+di*(0)+dj*(0)+dk*(-4)] - 3*(u)[index+di*(0)+dj*(0)+dk*(4)]))
+#define PDstandardNth11(u,i,j,k) (p1o5040dx2*(-14350*(u)[index+di*(0)+dj*(0)+dk*(0)] + 8064*((u)[index+di*(-1)+dj*(0)+dk*(0)] + (u)[index+di*(1)+dj*(0)+dk*(0)]) - 1008*((u)[index+di*(-2)+dj*(0)+dk*(0)] + (u)[index+di*(2)+dj*(0)+dk*(0)]) + 128*((u)[index+di*(-3)+dj*(0)+dk*(0)] + (u)[index+di*(3)+dj*(0)+dk*(0)]) - 9*((u)[index+di*(-4)+dj*(0)+dk*(0)] + (u)[index+di*(4)+dj*(0)+dk*(0)])))
+#define PDstandardNth22(u,i,j,k) (p1o5040dy2*(-14350*(u)[index+di*(0)+dj*(0)+dk*(0)] + 8064*((u)[index+di*(0)+dj*(-1)+dk*(0)] + (u)[index+di*(0)+dj*(1)+dk*(0)]) - 1008*((u)[index+di*(0)+dj*(-2)+dk*(0)] + (u)[index+di*(0)+dj*(2)+dk*(0)]) + 128*((u)[index+di*(0)+dj*(-3)+dk*(0)] + (u)[index+di*(0)+dj*(3)+dk*(0)]) - 9*((u)[index+di*(0)+dj*(-4)+dk*(0)] + (u)[index+di*(0)+dj*(4)+dk*(0)])))
+#define PDstandardNth33(u,i,j,k) (p1o5040dz2*(-14350*(u)[index+di*(0)+dj*(0)+dk*(0)] + 8064*((u)[index+di*(0)+dj*(0)+dk*(-1)] + (u)[index+di*(0)+dj*(0)+dk*(1)]) - 1008*((u)[index+di*(0)+dj*(0)+dk*(-2)] + (u)[index+di*(0)+dj*(0)+dk*(2)]) + 128*((u)[index+di*(0)+dj*(0)+dk*(-3)] + (u)[index+di*(0)+dj*(0)+dk*(3)]) - 9*((u)[index+di*(0)+dj*(0)+dk*(-4)] + (u)[index+di*(0)+dj*(0)+dk*(4)])))
+#define PDstandardNth12(u,i,j,k) (p1o705600dxdy*(-451584*((u)[index+di*(-1)+dj*(1)+dk*(0)] + (u)[index+di*(1)+dj*(-1)+dk*(0)]) + 451584*((u)[index+di*(-1)+dj*(-1)+dk*(0)] + (u)[index+di*(1)+dj*(1)+dk*(0)]) + 112896*((u)[index+di*(-1)+dj*(2)+dk*(0)] + (u)[index+di*(1)+dj*(-2)+dk*(0)] + (u)[index+di*(-2)+dj*(1)+dk*(0)] + (u)[index+di*(2)+dj*(-1)+dk*(0)]) - 112896*((u)[index+di*(-1)+dj*(-2)+dk*(0)] + (u)[index+di*(1)+dj*(2)+dk*(0)] + (u)[index+di*(-2)+dj*(-1)+dk*(0)] + (u)[index+di*(2)+dj*(1)+dk*(0)]) - 28224*((u)[index+di*(-2)+dj*(2)+dk*(0)] + (u)[index+di*(2)+dj*(-2)+dk*(0)]) + 28224*((u)[index+di*(-2)+dj*(-2)+dk*(0)] + (u)[index+di*(2)+dj*(2)+dk*(0)]) - 21504*((u)[index+di*(-1)+dj*(3)+dk*(0)] + (u)[index+di*(1)+dj*(-3)+dk*(0)] + (u)[index+di*(-3)+dj*(1)+dk*(0)] + (u)[index+di*(3)+dj*(-1)+dk*(0)]) + 21504*((u)[index+di*(-1)+dj*(-3)+dk*(0)] + (u)[index+di*(1)+dj*(3)+dk*(0)] + (u)[index+di*(-3)+dj*(-1)+dk*(0)] + (u)[index+di*(3)+dj*(1)+dk*(0)]) + 5376*((u)[index+di*(-2)+dj*(3)+dk*(0)] + (u)[index+di*(2)+dj*(-3)+dk*(0)] + (u)[index+di*(-3)+dj*(2)+dk*(0)] + (u)[index+di*(3)+dj*(-2)+dk*(0)]) - 5376*((u)[index+di*(-2)+dj*(-3)+dk*(0)] + (u)[index+di*(2)+dj*(3)+dk*(0)] + (u)[index+di*(-3)+dj*(-2)+dk*(0)] + (u)[index+di*(3)+dj*(2)+dk*(0)]) - 1024*((u)[index+di*(-3)+dj*(3)+dk*(0)] + (u)[index+di*(3)+dj*(-3)+dk*(0)]) + 1024*((u)[index+di*(-3)+dj*(-3)+dk*(0)] + (u)[index+di*(3)+dj*(3)+dk*(0)]) + 2016*((u)[index+di*(-1)+dj*(4)+dk*(0)] + (u)[index+di*(1)+dj*(-4)+dk*(0)] + (u)[index+di*(-4)+dj*(1)+dk*(0)] + (u)[index+di*(4)+dj*(-1)+dk*(0)]) - 2016*((u)[index+di*(-1)+dj*(-4)+dk*(0)] + (u)[index+di*(1)+dj*(4)+dk*(0)] + (u)[index+di*(-4)+dj*(-1)+dk*(0)] + (u)[index+di*(4)+dj*(1)+dk*(0)]) - 504*((u)[index+di*(-2)+dj*(4)+dk*(0)] + (u)[index+di*(2)+dj*(-4)+dk*(0)] + (u)[index+di*(-4)+dj*(2)+dk*(0)] + (u)[index+di*(4)+dj*(-2)+dk*(0)]) + 504*((u)[index+di*(-2)+dj*(-4)+dk*(0)] + (u)[index+di*(2)+dj*(4)+dk*(0)] + (u)[index+di*(-4)+dj*(-2)+dk*(0)] + (u)[index+di*(4)+dj*(2)+dk*(0)]) + 96*((u)[index+di*(-3)+dj*(4)+dk*(0)] + (u)[index+di*(3)+dj*(-4)+dk*(0)] + (u)[index+di*(-4)+dj*(3)+dk*(0)] + (u)[index+di*(4)+dj*(-3)+dk*(0)]) - 96*((u)[index+di*(-3)+dj*(-4)+dk*(0)] + (u)[index+di*(3)+dj*(4)+dk*(0)] + (u)[index+di*(-4)+dj*(-3)+dk*(0)] + (u)[index+di*(4)+dj*(3)+dk*(0)]) - 9*((u)[index+di*(-4)+dj*(4)+dk*(0)] + (u)[index+di*(4)+dj*(-4)+dk*(0)]) + 9*((u)[index+di*(-4)+dj*(-4)+dk*(0)] + (u)[index+di*(4)+dj*(4)+dk*(0)])))
+#define PDstandardNth13(u,i,j,k) (p1o705600dxdz*(-451584*((u)[index+di*(-1)+dj*(0)+dk*(1)] + (u)[index+di*(1)+dj*(0)+dk*(-1)]) + 451584*((u)[index+di*(-1)+dj*(0)+dk*(-1)] + (u)[index+di*(1)+dj*(0)+dk*(1)]) + 112896*((u)[index+di*(-1)+dj*(0)+dk*(2)] + (u)[index+di*(1)+dj*(0)+dk*(-2)] + (u)[index+di*(-2)+dj*(0)+dk*(1)] + (u)[index+di*(2)+dj*(0)+dk*(-1)]) - 112896*((u)[index+di*(-1)+dj*(0)+dk*(-2)] + (u)[index+di*(1)+dj*(0)+dk*(2)] + (u)[index+di*(-2)+dj*(0)+dk*(-1)] + (u)[index+di*(2)+dj*(0)+dk*(1)]) - 28224*((u)[index+di*(-2)+dj*(0)+dk*(2)] + (u)[index+di*(2)+dj*(0)+dk*(-2)]) + 28224*((u)[index+di*(-2)+dj*(0)+dk*(-2)] + (u)[index+di*(2)+dj*(0)+dk*(2)]) - 21504*((u)[index+di*(-1)+dj*(0)+dk*(3)] + (u)[index+di*(1)+dj*(0)+dk*(-3)] + (u)[index+di*(-3)+dj*(0)+dk*(1)] + (u)[index+di*(3)+dj*(0)+dk*(-1)]) + 21504*((u)[index+di*(-1)+dj*(0)+dk*(-3)] + (u)[index+di*(1)+dj*(0)+dk*(3)] + (u)[index+di*(-3)+dj*(0)+dk*(-1)] + (u)[index+di*(3)+dj*(0)+dk*(1)]) + 5376*((u)[index+di*(-2)+dj*(0)+dk*(3)] + (u)[index+di*(2)+dj*(0)+dk*(-3)] + (u)[index+di*(-3)+dj*(0)+dk*(2)] + (u)[index+di*(3)+dj*(0)+dk*(-2)]) - 5376*((u)[index+di*(-2)+dj*(0)+dk*(-3)] + (u)[index+di*(2)+dj*(0)+dk*(3)] + (u)[index+di*(-3)+dj*(0)+dk*(-2)] + (u)[index+di*(3)+dj*(0)+dk*(2)]) - 1024*((u)[index+di*(-3)+dj*(0)+dk*(3)] + (u)[index+di*(3)+dj*(0)+dk*(-3)]) + 1024*((u)[index+di*(-3)+dj*(0)+dk*(-3)] + (u)[index+di*(3)+dj*(0)+dk*(3)]) + 2016*((u)[index+di*(-1)+dj*(0)+dk*(4)] + (u)[index+di*(1)+dj*(0)+dk*(-4)] + (u)[index+di*(-4)+dj*(0)+dk*(1)] + (u)[index+di*(4)+dj*(0)+dk*(-1)]) - 2016*((u)[index+di*(-1)+dj*(0)+dk*(-4)] + (u)[index+di*(1)+dj*(0)+dk*(4)] + (u)[index+di*(-4)+dj*(0)+dk*(-1)] + (u)[index+di*(4)+dj*(0)+dk*(1)]) - 504*((u)[index+di*(-2)+dj*(0)+dk*(4)] + (u)[index+di*(2)+dj*(0)+dk*(-4)] + (u)[index+di*(-4)+dj*(0)+dk*(2)] + (u)[index+di*(4)+dj*(0)+dk*(-2)]) + 504*((u)[index+di*(-2)+dj*(0)+dk*(-4)] + (u)[index+di*(2)+dj*(0)+dk*(4)] + (u)[index+di*(-4)+dj*(0)+dk*(-2)] + (u)[index+di*(4)+dj*(0)+dk*(2)]) + 96*((u)[index+di*(-3)+dj*(0)+dk*(4)] + (u)[index+di*(3)+dj*(0)+dk*(-4)] + (u)[index+di*(-4)+dj*(0)+dk*(3)] + (u)[index+di*(4)+dj*(0)+dk*(-3)]) - 96*((u)[index+di*(-3)+dj*(0)+dk*(-4)] + (u)[index+di*(3)+dj*(0)+dk*(4)] + (u)[index+di*(-4)+dj*(0)+dk*(-3)] + (u)[index+di*(4)+dj*(0)+dk*(3)]) - 9*((u)[index+di*(-4)+dj*(0)+dk*(4)] + (u)[index+di*(4)+dj*(0)+dk*(-4)]) + 9*((u)[index+di*(-4)+dj*(0)+dk*(-4)] + (u)[index+di*(4)+dj*(0)+dk*(4)])))
+#define PDstandardNth21(u,i,j,k) (p1o705600dxdy*(-451584*((u)[index+di*(-1)+dj*(1)+dk*(0)] + (u)[index+di*(1)+dj*(-1)+dk*(0)]) + 451584*((u)[index+di*(-1)+dj*(-1)+dk*(0)] + (u)[index+di*(1)+dj*(1)+dk*(0)]) + 112896*((u)[index+di*(-1)+dj*(2)+dk*(0)] + (u)[index+di*(1)+dj*(-2)+dk*(0)] + (u)[index+di*(-2)+dj*(1)+dk*(0)] + (u)[index+di*(2)+dj*(-1)+dk*(0)]) - 112896*((u)[index+di*(-1)+dj*(-2)+dk*(0)] + (u)[index+di*(1)+dj*(2)+dk*(0)] + (u)[index+di*(-2)+dj*(-1)+dk*(0)] + (u)[index+di*(2)+dj*(1)+dk*(0)]) - 28224*((u)[index+di*(-2)+dj*(2)+dk*(0)] + (u)[index+di*(2)+dj*(-2)+dk*(0)]) + 28224*((u)[index+di*(-2)+dj*(-2)+dk*(0)] + (u)[index+di*(2)+dj*(2)+dk*(0)]) - 21504*((u)[index+di*(-1)+dj*(3)+dk*(0)] + (u)[index+di*(1)+dj*(-3)+dk*(0)] + (u)[index+di*(-3)+dj*(1)+dk*(0)] + (u)[index+di*(3)+dj*(-1)+dk*(0)]) + 21504*((u)[index+di*(-1)+dj*(-3)+dk*(0)] + (u)[index+di*(1)+dj*(3)+dk*(0)] + (u)[index+di*(-3)+dj*(-1)+dk*(0)] + (u)[index+di*(3)+dj*(1)+dk*(0)]) + 5376*((u)[index+di*(-2)+dj*(3)+dk*(0)] + (u)[index+di*(2)+dj*(-3)+dk*(0)] + (u)[index+di*(-3)+dj*(2)+dk*(0)] + (u)[index+di*(3)+dj*(-2)+dk*(0)]) - 5376*((u)[index+di*(-2)+dj*(-3)+dk*(0)] + (u)[index+di*(2)+dj*(3)+dk*(0)] + (u)[index+di*(-3)+dj*(-2)+dk*(0)] + (u)[index+di*(3)+dj*(2)+dk*(0)]) - 1024*((u)[index+di*(-3)+dj*(3)+dk*(0)] + (u)[index+di*(3)+dj*(-3)+dk*(0)]) + 1024*((u)[index+di*(-3)+dj*(-3)+dk*(0)] + (u)[index+di*(3)+dj*(3)+dk*(0)]) + 2016*((u)[index+di*(-1)+dj*(4)+dk*(0)] + (u)[index+di*(1)+dj*(-4)+dk*(0)] + (u)[index+di*(-4)+dj*(1)+dk*(0)] + (u)[index+di*(4)+dj*(-1)+dk*(0)]) - 2016*((u)[index+di*(-1)+dj*(-4)+dk*(0)] + (u)[index+di*(1)+dj*(4)+dk*(0)] + (u)[index+di*(-4)+dj*(-1)+dk*(0)] + (u)[index+di*(4)+dj*(1)+dk*(0)]) - 504*((u)[index+di*(-2)+dj*(4)+dk*(0)] + (u)[index+di*(2)+dj*(-4)+dk*(0)] + (u)[index+di*(-4)+dj*(2)+dk*(0)] + (u)[index+di*(4)+dj*(-2)+dk*(0)]) + 504*((u)[index+di*(-2)+dj*(-4)+dk*(0)] + (u)[index+di*(2)+dj*(4)+dk*(0)] + (u)[index+di*(-4)+dj*(-2)+dk*(0)] + (u)[index+di*(4)+dj*(2)+dk*(0)]) + 96*((u)[index+di*(-3)+dj*(4)+dk*(0)] + (u)[index+di*(3)+dj*(-4)+dk*(0)] + (u)[index+di*(-4)+dj*(3)+dk*(0)] + (u)[index+di*(4)+dj*(-3)+dk*(0)]) - 96*((u)[index+di*(-3)+dj*(-4)+dk*(0)] + (u)[index+di*(3)+dj*(4)+dk*(0)] + (u)[index+di*(-4)+dj*(-3)+dk*(0)] + (u)[index+di*(4)+dj*(3)+dk*(0)]) - 9*((u)[index+di*(-4)+dj*(4)+dk*(0)] + (u)[index+di*(4)+dj*(-4)+dk*(0)]) + 9*((u)[index+di*(-4)+dj*(-4)+dk*(0)] + (u)[index+di*(4)+dj*(4)+dk*(0)])))
+#define PDstandardNth23(u,i,j,k) (p1o705600dydz*(-451584*((u)[index+di*(0)+dj*(-1)+dk*(1)] + (u)[index+di*(0)+dj*(1)+dk*(-1)]) + 451584*((u)[index+di*(0)+dj*(-1)+dk*(-1)] + (u)[index+di*(0)+dj*(1)+dk*(1)]) + 112896*((u)[index+di*(0)+dj*(-1)+dk*(2)] + (u)[index+di*(0)+dj*(1)+dk*(-2)] + (u)[index+di*(0)+dj*(-2)+dk*(1)] + (u)[index+di*(0)+dj*(2)+dk*(-1)]) - 112896*((u)[index+di*(0)+dj*(-1)+dk*(-2)] + (u)[index+di*(0)+dj*(1)+dk*(2)] + (u)[index+di*(0)+dj*(-2)+dk*(-1)] + (u)[index+di*(0)+dj*(2)+dk*(1)]) - 28224*((u)[index+di*(0)+dj*(-2)+dk*(2)] + (u)[index+di*(0)+dj*(2)+dk*(-2)]) + 28224*((u)[index+di*(0)+dj*(-2)+dk*(-2)] + (u)[index+di*(0)+dj*(2)+dk*(2)]) - 21504*((u)[index+di*(0)+dj*(-1)+dk*(3)] + (u)[index+di*(0)+dj*(1)+dk*(-3)] + (u)[index+di*(0)+dj*(-3)+dk*(1)] + (u)[index+di*(0)+dj*(3)+dk*(-1)]) + 21504*((u)[index+di*(0)+dj*(-1)+dk*(-3)] + (u)[index+di*(0)+dj*(1)+dk*(3)] + (u)[index+di*(0)+dj*(-3)+dk*(-1)] + (u)[index+di*(0)+dj*(3)+dk*(1)]) + 5376*((u)[index+di*(0)+dj*(-2)+dk*(3)] + (u)[index+di*(0)+dj*(2)+dk*(-3)] + (u)[index+di*(0)+dj*(-3)+dk*(2)] + (u)[index+di*(0)+dj*(3)+dk*(-2)]) - 5376*((u)[index+di*(0)+dj*(-2)+dk*(-3)] + (u)[index+di*(0)+dj*(2)+dk*(3)] + (u)[index+di*(0)+dj*(-3)+dk*(-2)] + (u)[index+di*(0)+dj*(3)+dk*(2)]) - 1024*((u)[index+di*(0)+dj*(-3)+dk*(3)] + (u)[index+di*(0)+dj*(3)+dk*(-3)]) + 1024*((u)[index+di*(0)+dj*(-3)+dk*(-3)] + (u)[index+di*(0)+dj*(3)+dk*(3)]) + 2016*((u)[index+di*(0)+dj*(-1)+dk*(4)] + (u)[index+di*(0)+dj*(1)+dk*(-4)] + (u)[index+di*(0)+dj*(-4)+dk*(1)] + (u)[index+di*(0)+dj*(4)+dk*(-1)]) - 2016*((u)[index+di*(0)+dj*(-1)+dk*(-4)] + (u)[index+di*(0)+dj*(1)+dk*(4)] + (u)[index+di*(0)+dj*(-4)+dk*(-1)] + (u)[index+di*(0)+dj*(4)+dk*(1)]) - 504*((u)[index+di*(0)+dj*(-2)+dk*(4)] + (u)[index+di*(0)+dj*(2)+dk*(-4)] + (u)[index+di*(0)+dj*(-4)+dk*(2)] + (u)[index+di*(0)+dj*(4)+dk*(-2)]) + 504*((u)[index+di*(0)+dj*(-2)+dk*(-4)] + (u)[index+di*(0)+dj*(2)+dk*(4)] + (u)[index+di*(0)+dj*(-4)+dk*(-2)] + (u)[index+di*(0)+dj*(4)+dk*(2)]) + 96*((u)[index+di*(0)+dj*(-3)+dk*(4)] + (u)[index+di*(0)+dj*(3)+dk*(-4)] + (u)[index+di*(0)+dj*(-4)+dk*(3)] + (u)[index+di*(0)+dj*(4)+dk*(-3)]) - 96*((u)[index+di*(0)+dj*(-3)+dk*(-4)] + (u)[index+di*(0)+dj*(3)+dk*(4)] + (u)[index+di*(0)+dj*(-4)+dk*(-3)] + (u)[index+di*(0)+dj*(4)+dk*(3)]) - 9*((u)[index+di*(0)+dj*(-4)+dk*(4)] + (u)[index+di*(0)+dj*(4)+dk*(-4)]) + 9*((u)[index+di*(0)+dj*(-4)+dk*(-4)] + (u)[index+di*(0)+dj*(4)+dk*(4)])))
+#define PDstandardNth31(u,i,j,k) (p1o705600dxdz*(-451584*((u)[index+di*(-1)+dj*(0)+dk*(1)] + (u)[index+di*(1)+dj*(0)+dk*(-1)]) + 451584*((u)[index+di*(-1)+dj*(0)+dk*(-1)] + (u)[index+di*(1)+dj*(0)+dk*(1)]) + 112896*((u)[index+di*(-1)+dj*(0)+dk*(2)] + (u)[index+di*(1)+dj*(0)+dk*(-2)] + (u)[index+di*(-2)+dj*(0)+dk*(1)] + (u)[index+di*(2)+dj*(0)+dk*(-1)]) - 112896*((u)[index+di*(-1)+dj*(0)+dk*(-2)] + (u)[index+di*(1)+dj*(0)+dk*(2)] + (u)[index+di*(-2)+dj*(0)+dk*(-1)] + (u)[index+di*(2)+dj*(0)+dk*(1)]) - 28224*((u)[index+di*(-2)+dj*(0)+dk*(2)] + (u)[index+di*(2)+dj*(0)+dk*(-2)]) + 28224*((u)[index+di*(-2)+dj*(0)+dk*(-2)] + (u)[index+di*(2)+dj*(0)+dk*(2)]) - 21504*((u)[index+di*(-1)+dj*(0)+dk*(3)] + (u)[index+di*(1)+dj*(0)+dk*(-3)] + (u)[index+di*(-3)+dj*(0)+dk*(1)] + (u)[index+di*(3)+dj*(0)+dk*(-1)]) + 21504*((u)[index+di*(-1)+dj*(0)+dk*(-3)] + (u)[index+di*(1)+dj*(0)+dk*(3)] + (u)[index+di*(-3)+dj*(0)+dk*(-1)] + (u)[index+di*(3)+dj*(0)+dk*(1)]) + 5376*((u)[index+di*(-2)+dj*(0)+dk*(3)] + (u)[index+di*(2)+dj*(0)+dk*(-3)] + (u)[index+di*(-3)+dj*(0)+dk*(2)] + (u)[index+di*(3)+dj*(0)+dk*(-2)]) - 5376*((u)[index+di*(-2)+dj*(0)+dk*(-3)] + (u)[index+di*(2)+dj*(0)+dk*(3)] + (u)[index+di*(-3)+dj*(0)+dk*(-2)] + (u)[index+di*(3)+dj*(0)+dk*(2)]) - 1024*((u)[index+di*(-3)+dj*(0)+dk*(3)] + (u)[index+di*(3)+dj*(0)+dk*(-3)]) + 1024*((u)[index+di*(-3)+dj*(0)+dk*(-3)] + (u)[index+di*(3)+dj*(0)+dk*(3)]) + 2016*((u)[index+di*(-1)+dj*(0)+dk*(4)] + (u)[index+di*(1)+dj*(0)+dk*(-4)] + (u)[index+di*(-4)+dj*(0)+dk*(1)] + (u)[index+di*(4)+dj*(0)+dk*(-1)]) - 2016*((u)[index+di*(-1)+dj*(0)+dk*(-4)] + (u)[index+di*(1)+dj*(0)+dk*(4)] + (u)[index+di*(-4)+dj*(0)+dk*(-1)] + (u)[index+di*(4)+dj*(0)+dk*(1)]) - 504*((u)[index+di*(-2)+dj*(0)+dk*(4)] + (u)[index+di*(2)+dj*(0)+dk*(-4)] + (u)[index+di*(-4)+dj*(0)+dk*(2)] + (u)[index+di*(4)+dj*(0)+dk*(-2)]) + 504*((u)[index+di*(-2)+dj*(0)+dk*(-4)] + (u)[index+di*(2)+dj*(0)+dk*(4)] + (u)[index+di*(-4)+dj*(0)+dk*(-2)] + (u)[index+di*(4)+dj*(0)+dk*(2)]) + 96*((u)[index+di*(-3)+dj*(0)+dk*(4)] + (u)[index+di*(3)+dj*(0)+dk*(-4)] + (u)[index+di*(-4)+dj*(0)+dk*(3)] + (u)[index+di*(4)+dj*(0)+dk*(-3)]) - 96*((u)[index+di*(-3)+dj*(0)+dk*(-4)] + (u)[index+di*(3)+dj*(0)+dk*(4)] + (u)[index+di*(-4)+dj*(0)+dk*(-3)] + (u)[index+di*(4)+dj*(0)+dk*(3)]) - 9*((u)[index+di*(-4)+dj*(0)+dk*(4)] + (u)[index+di*(4)+dj*(0)+dk*(-4)]) + 9*((u)[index+di*(-4)+dj*(0)+dk*(-4)] + (u)[index+di*(4)+dj*(0)+dk*(4)])))
+#define PDstandardNth32(u,i,j,k) (p1o705600dydz*(-451584*((u)[index+di*(0)+dj*(-1)+dk*(1)] + (u)[index+di*(0)+dj*(1)+dk*(-1)]) + 451584*((u)[index+di*(0)+dj*(-1)+dk*(-1)] + (u)[index+di*(0)+dj*(1)+dk*(1)]) + 112896*((u)[index+di*(0)+dj*(-1)+dk*(2)] + (u)[index+di*(0)+dj*(1)+dk*(-2)] + (u)[index+di*(0)+dj*(-2)+dk*(1)] + (u)[index+di*(0)+dj*(2)+dk*(-1)]) - 112896*((u)[index+di*(0)+dj*(-1)+dk*(-2)] + (u)[index+di*(0)+dj*(1)+dk*(2)] + (u)[index+di*(0)+dj*(-2)+dk*(-1)] + (u)[index+di*(0)+dj*(2)+dk*(1)]) - 28224*((u)[index+di*(0)+dj*(-2)+dk*(2)] + (u)[index+di*(0)+dj*(2)+dk*(-2)]) + 28224*((u)[index+di*(0)+dj*(-2)+dk*(-2)] + (u)[index+di*(0)+dj*(2)+dk*(2)]) - 21504*((u)[index+di*(0)+dj*(-1)+dk*(3)] + (u)[index+di*(0)+dj*(1)+dk*(-3)] + (u)[index+di*(0)+dj*(-3)+dk*(1)] + (u)[index+di*(0)+dj*(3)+dk*(-1)]) + 21504*((u)[index+di*(0)+dj*(-1)+dk*(-3)] + (u)[index+di*(0)+dj*(1)+dk*(3)] + (u)[index+di*(0)+dj*(-3)+dk*(-1)] + (u)[index+di*(0)+dj*(3)+dk*(1)]) + 5376*((u)[index+di*(0)+dj*(-2)+dk*(3)] + (u)[index+di*(0)+dj*(2)+dk*(-3)] + (u)[index+di*(0)+dj*(-3)+dk*(2)] + (u)[index+di*(0)+dj*(3)+dk*(-2)]) - 5376*((u)[index+di*(0)+dj*(-2)+dk*(-3)] + (u)[index+di*(0)+dj*(2)+dk*(3)] + (u)[index+di*(0)+dj*(-3)+dk*(-2)] + (u)[index+di*(0)+dj*(3)+dk*(2)]) - 1024*((u)[index+di*(0)+dj*(-3)+dk*(3)] + (u)[index+di*(0)+dj*(3)+dk*(-3)]) + 1024*((u)[index+di*(0)+dj*(-3)+dk*(-3)] + (u)[index+di*(0)+dj*(3)+dk*(3)]) + 2016*((u)[index+di*(0)+dj*(-1)+dk*(4)] + (u)[index+di*(0)+dj*(1)+dk*(-4)] + (u)[index+di*(0)+dj*(-4)+dk*(1)] + (u)[index+di*(0)+dj*(4)+dk*(-1)]) - 2016*((u)[index+di*(0)+dj*(-1)+dk*(-4)] + (u)[index+di*(0)+dj*(1)+dk*(4)] + (u)[index+di*(0)+dj*(-4)+dk*(-1)] + (u)[index+di*(0)+dj*(4)+dk*(1)]) - 504*((u)[index+di*(0)+dj*(-2)+dk*(4)] + (u)[index+di*(0)+dj*(2)+dk*(-4)] + (u)[index+di*(0)+dj*(-4)+dk*(2)] + (u)[index+di*(0)+dj*(4)+dk*(-2)]) + 504*((u)[index+di*(0)+dj*(-2)+dk*(-4)] + (u)[index+di*(0)+dj*(2)+dk*(4)] + (u)[index+di*(0)+dj*(-4)+dk*(-2)] + (u)[index+di*(0)+dj*(4)+dk*(2)]) + 96*((u)[index+di*(0)+dj*(-3)+dk*(4)] + (u)[index+di*(0)+dj*(3)+dk*(-4)] + (u)[index+di*(0)+dj*(-4)+dk*(3)] + (u)[index+di*(0)+dj*(4)+dk*(-3)]) - 96*((u)[index+di*(0)+dj*(-3)+dk*(-4)] + (u)[index+di*(0)+dj*(3)+dk*(4)] + (u)[index+di*(0)+dj*(-4)+dk*(-3)] + (u)[index+di*(0)+dj*(4)+dk*(3)]) - 9*((u)[index+di*(0)+dj*(-4)+dk*(4)] + (u)[index+di*(0)+dj*(4)+dk*(-4)]) + 9*((u)[index+di*(0)+dj*(-4)+dk*(-4)] + (u)[index+di*(0)+dj*(4)+dk*(4)])))
+#define PDdissipationNth1(u,i,j,k) (p1o1024dx*(-252*(u)[index+di*(0)+dj*(0)+dk*(0)] + 210*((u)[index+di*(-1)+dj*(0)+dk*(0)] + (u)[index+di*(1)+dj*(0)+dk*(0)]) - 120*((u)[index+di*(-2)+dj*(0)+dk*(0)] + (u)[index+di*(2)+dj*(0)+dk*(0)]) + 45*((u)[index+di*(-3)+dj*(0)+dk*(0)] + (u)[index+di*(3)+dj*(0)+dk*(0)]) - 10*((u)[index+di*(-4)+dj*(0)+dk*(0)] + (u)[index+di*(4)+dj*(0)+dk*(0)]) + (u)[index+di*(-5)+dj*(0)+dk*(0)] + (u)[index+di*(5)+dj*(0)+dk*(0)]))
+#define PDdissipationNth2(u,i,j,k) (p1o1024dy*(-252*(u)[index+di*(0)+dj*(0)+dk*(0)] + 210*((u)[index+di*(0)+dj*(-1)+dk*(0)] + (u)[index+di*(0)+dj*(1)+dk*(0)]) - 120*((u)[index+di*(0)+dj*(-2)+dk*(0)] + (u)[index+di*(0)+dj*(2)+dk*(0)]) + 45*((u)[index+di*(0)+dj*(-3)+dk*(0)] + (u)[index+di*(0)+dj*(3)+dk*(0)]) - 10*((u)[index+di*(0)+dj*(-4)+dk*(0)] + (u)[index+di*(0)+dj*(4)+dk*(0)]) + (u)[index+di*(0)+dj*(-5)+dk*(0)] + (u)[index+di*(0)+dj*(5)+dk*(0)]))
+#define PDdissipationNth3(u,i,j,k) (p1o1024dz*(-252*(u)[index+di*(0)+dj*(0)+dk*(0)] + 210*((u)[index+di*(0)+dj*(0)+dk*(-1)] + (u)[index+di*(0)+dj*(0)+dk*(1)]) - 120*((u)[index+di*(0)+dj*(0)+dk*(-2)] + (u)[index+di*(0)+dj*(0)+dk*(2)]) + 45*((u)[index+di*(0)+dj*(0)+dk*(-3)] + (u)[index+di*(0)+dj*(0)+dk*(3)]) - 10*((u)[index+di*(0)+dj*(0)+dk*(-4)] + (u)[index+di*(0)+dj*(0)+dk*(4)]) + (u)[index+di*(0)+dj*(0)+dk*(-5)] + (u)[index+di*(0)+dj*(0)+dk*(5)]))
+#define PDupwindNth1(u,i,j,k) (pm1o840dx*(378*(u)[index+di*(0)+dj*(0)+dk*(0)] - 60*(u)[index+di*(-2*dir1)+dj*(0)+dk*(0)] + 5*(u)[index+di*(-3*dir1)+dj*(0)+dk*(0)] - 140*(u)[index+di*(3*dir1)+dj*(0)+dk*(0)] + 30*(u)[index+di*(4*dir1)+dj*(0)+dk*(0)] - 3*(u)[index+di*(5*dir1)+dj*(0)+dk*(0)] + 420*((u)[index+di*(2*dir1)+dj*(0)+dk*(0)] + (u)[index+di*(-dir1)+dj*(0)+dk*(0)]) - 1050*(u)[index+di*(dir1)+dj*(0)+dk*(0)])*dir1)
+#define PDupwindNth2(u,i,j,k) (pm1o840dy*(378*(u)[index+di*(0)+dj*(0)+dk*(0)] - 60*(u)[index+di*(0)+dj*(-2*dir2)+dk*(0)] + 5*(u)[index+di*(0)+dj*(-3*dir2)+dk*(0)] - 140*(u)[index+di*(0)+dj*(3*dir2)+dk*(0)] + 30*(u)[index+di*(0)+dj*(4*dir2)+dk*(0)] - 3*(u)[index+di*(0)+dj*(5*dir2)+dk*(0)] + 420*((u)[index+di*(0)+dj*(2*dir2)+dk*(0)] + (u)[index+di*(0)+dj*(-dir2)+dk*(0)]) - 1050*(u)[index+di*(0)+dj*(dir2)+dk*(0)])*dir2)
+#define PDupwindNth3(u,i,j,k) (pm1o840dz*(378*(u)[index+di*(0)+dj*(0)+dk*(0)] - 60*(u)[index+di*(0)+dj*(0)+dk*(-2*dir3)] + 5*(u)[index+di*(0)+dj*(0)+dk*(-3*dir3)] - 140*(u)[index+di*(0)+dj*(0)+dk*(3*dir3)] + 30*(u)[index+di*(0)+dj*(0)+dk*(4*dir3)] - 3*(u)[index+di*(0)+dj*(0)+dk*(5*dir3)] + 420*((u)[index+di*(0)+dj*(0)+dk*(2*dir3)] + (u)[index+di*(0)+dj*(0)+dk*(-dir3)]) - 1050*(u)[index+di*(0)+dj*(0)+dk*(dir3)])*dir3)
+#define PDonesided1(u,i,j,k) (p1odx*(-(u)[index+di*(0)+dj*(0)+dk*(0)] + (u)[index+di*(dir1)+dj*(0)+dk*(0)])*dir1)
+#define PDonesided2(u,i,j,k) (p1ody*(-(u)[index+di*(0)+dj*(0)+dk*(0)] + (u)[index+di*(0)+dj*(dir2)+dk*(0)])*dir2)
+#define PDonesided3(u,i,j,k) (p1odz*(-(u)[index+di*(0)+dj*(0)+dk*(0)] + (u)[index+di*(0)+dj*(0)+dk*(dir3)])*dir3)
+#define PDupwindNthAnti1(u,i,j,k) (p1o1680dx*(-1470*(u)[index+di*(-1)+dj*(0)+dk*(0)] + 1470*(u)[index+di*(1)+dj*(0)+dk*(0)] + 480*(u)[index+di*(-2)+dj*(0)+dk*(0)] - 480*(u)[index+di*(2)+dj*(0)+dk*(0)] - 145*(u)[index+di*(-3)+dj*(0)+dk*(0)] + 145*(u)[index+di*(3)+dj*(0)+dk*(0)] + 30*(u)[index+di*(-4)+dj*(0)+dk*(0)] - 30*(u)[index+di*(4)+dj*(0)+dk*(0)] - 3*(u)[index+di*(-5)+dj*(0)+dk*(0)] + 3*(u)[index+di*(5)+dj*(0)+dk*(0)]))
+#define PDupwindNthSymm1(u,i,j,k) (p1o560dx*(-252*(u)[index+di*(0)+dj*(0)+dk*(0)] + 210*((u)[index+di*(-1)+dj*(0)+dk*(0)] + (u)[index+di*(1)+dj*(0)+dk*(0)]) - 120*((u)[index+di*(-2)+dj*(0)+dk*(0)] + (u)[index+di*(2)+dj*(0)+dk*(0)]) + 45*((u)[index+di*(-3)+dj*(0)+dk*(0)] + (u)[index+di*(3)+dj*(0)+dk*(0)]) - 10*((u)[index+di*(-4)+dj*(0)+dk*(0)] + (u)[index+di*(4)+dj*(0)+dk*(0)]) + (u)[index+di*(-5)+dj*(0)+dk*(0)] + (u)[index+di*(5)+dj*(0)+dk*(0)]))
+#define PDupwindNthAnti2(u,i,j,k) (p1o1680dy*(-1470*(u)[index+di*(0)+dj*(-1)+dk*(0)] + 1470*(u)[index+di*(0)+dj*(1)+dk*(0)] + 480*(u)[index+di*(0)+dj*(-2)+dk*(0)] - 480*(u)[index+di*(0)+dj*(2)+dk*(0)] - 145*(u)[index+di*(0)+dj*(-3)+dk*(0)] + 145*(u)[index+di*(0)+dj*(3)+dk*(0)] + 30*(u)[index+di*(0)+dj*(-4)+dk*(0)] - 30*(u)[index+di*(0)+dj*(4)+dk*(0)] - 3*(u)[index+di*(0)+dj*(-5)+dk*(0)] + 3*(u)[index+di*(0)+dj*(5)+dk*(0)]))
+#define PDupwindNthSymm2(u,i,j,k) (p1o560dy*(-252*(u)[index+di*(0)+dj*(0)+dk*(0)] + 210*((u)[index+di*(0)+dj*(-1)+dk*(0)] + (u)[index+di*(0)+dj*(1)+dk*(0)]) - 120*((u)[index+di*(0)+dj*(-2)+dk*(0)] + (u)[index+di*(0)+dj*(2)+dk*(0)]) + 45*((u)[index+di*(0)+dj*(-3)+dk*(0)] + (u)[index+di*(0)+dj*(3)+dk*(0)]) - 10*((u)[index+di*(0)+dj*(-4)+dk*(0)] + (u)[index+di*(0)+dj*(4)+dk*(0)]) + (u)[index+di*(0)+dj*(-5)+dk*(0)] + (u)[index+di*(0)+dj*(5)+dk*(0)]))
+#define PDupwindNthAnti3(u,i,j,k) (p1o1680dz*(-1470*(u)[index+di*(0)+dj*(0)+dk*(-1)] + 1470*(u)[index+di*(0)+dj*(0)+dk*(1)] + 480*(u)[index+di*(0)+dj*(0)+dk*(-2)] - 480*(u)[index+di*(0)+dj*(0)+dk*(2)] - 145*(u)[index+di*(0)+dj*(0)+dk*(-3)] + 145*(u)[index+di*(0)+dj*(0)+dk*(3)] + 30*(u)[index+di*(0)+dj*(0)+dk*(-4)] - 30*(u)[index+di*(0)+dj*(0)+dk*(4)] - 3*(u)[index+di*(0)+dj*(0)+dk*(-5)] + 3*(u)[index+di*(0)+dj*(0)+dk*(5)]))
+#define PDupwindNthSymm3(u,i,j,k) (p1o560dz*(-252*(u)[index+di*(0)+dj*(0)+dk*(0)] + 210*((u)[index+di*(0)+dj*(0)+dk*(-1)] + (u)[index+di*(0)+dj*(0)+dk*(1)]) - 120*((u)[index+di*(0)+dj*(0)+dk*(-2)] + (u)[index+di*(0)+dj*(0)+dk*(2)]) + 45*((u)[index+di*(0)+dj*(0)+dk*(-3)] + (u)[index+di*(0)+dj*(0)+dk*(3)]) - 10*((u)[index+di*(0)+dj*(0)+dk*(-4)] + (u)[index+di*(0)+dj*(0)+dk*(4)]) + (u)[index+di*(0)+dj*(0)+dk*(-5)] + (u)[index+di*(0)+dj*(0)+dk*(5)]))
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.cc b/ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.c
index 78f503a..8cfae7f 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_Minkowski_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_Minkowski_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -103,89 +102,88 @@ static void ML_BSSN_O8_Minkowski_Body(cGH const * restrict const cctkGH, int con
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC phiL = IfThen(conformalMethod,1,0);
+    CCTK_REAL phiL = IfThen(conformalMethod,1,0);
     
-    CCTK_REAL_VEC gt11L = 1;
+    CCTK_REAL gt11L = 1;
     
-    CCTK_REAL_VEC gt12L = 0;
+    CCTK_REAL gt12L = 0;
     
-    CCTK_REAL_VEC gt13L = 0;
+    CCTK_REAL gt13L = 0;
     
-    CCTK_REAL_VEC gt22L = 1;
+    CCTK_REAL gt22L = 1;
     
-    CCTK_REAL_VEC gt23L = 0;
+    CCTK_REAL gt23L = 0;
     
-    CCTK_REAL_VEC gt33L = 1;
+    CCTK_REAL gt33L = 1;
     
-    CCTK_REAL_VEC trKL = 0;
+    CCTK_REAL trKL = 0;
     
-    CCTK_REAL_VEC At11L = 0;
+    CCTK_REAL At11L = 0;
     
-    CCTK_REAL_VEC At12L = 0;
+    CCTK_REAL At12L = 0;
     
-    CCTK_REAL_VEC At13L = 0;
+    CCTK_REAL At13L = 0;
     
-    CCTK_REAL_VEC At22L = 0;
+    CCTK_REAL At22L = 0;
     
-    CCTK_REAL_VEC At23L = 0;
+    CCTK_REAL At23L = 0;
     
-    CCTK_REAL_VEC At33L = 0;
+    CCTK_REAL At33L = 0;
     
-    CCTK_REAL_VEC Xt1L = 0;
+    CCTK_REAL Xt1L = 0;
     
-    CCTK_REAL_VEC Xt2L = 0;
+    CCTK_REAL Xt2L = 0;
     
-    CCTK_REAL_VEC Xt3L = 0;
+    CCTK_REAL Xt3L = 0;
     
-    CCTK_REAL_VEC alphaL = 1;
+    CCTK_REAL alphaL = 1;
     
-    CCTK_REAL_VEC AL = 0;
+    CCTK_REAL AL = 0;
     
-    CCTK_REAL_VEC beta1L = 0;
+    CCTK_REAL beta1L = 0;
     
-    CCTK_REAL_VEC beta2L = 0;
+    CCTK_REAL beta2L = 0;
     
-    CCTK_REAL_VEC beta3L = 0;
+    CCTK_REAL beta3L = 0;
     
-    CCTK_REAL_VEC B1L = 0;
+    CCTK_REAL B1L = 0;
     
-    CCTK_REAL_VEC B2L = 0;
+    CCTK_REAL B2L = 0;
     
-    CCTK_REAL_VEC B3L = 0;
+    CCTK_REAL B3L = 0;
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(A[index],AL);
-    vec_store_nta(alpha[index],alphaL);
-    vec_store_nta(At11[index],At11L);
-    vec_store_nta(At12[index],At12L);
-    vec_store_nta(At13[index],At13L);
-    vec_store_nta(At22[index],At22L);
-    vec_store_nta(At23[index],At23L);
-    vec_store_nta(At33[index],At33L);
-    vec_store_nta(B1[index],B1L);
-    vec_store_nta(B2[index],B2L);
-    vec_store_nta(B3[index],B3L);
-    vec_store_nta(beta1[index],beta1L);
-    vec_store_nta(beta2[index],beta2L);
-    vec_store_nta(beta3[index],beta3L);
-    vec_store_nta(gt11[index],gt11L);
-    vec_store_nta(gt12[index],gt12L);
-    vec_store_nta(gt13[index],gt13L);
-    vec_store_nta(gt22[index],gt22L);
-    vec_store_nta(gt23[index],gt23L);
-    vec_store_nta(gt33[index],gt33L);
-    vec_store_nta(phi[index],phiL);
-    vec_store_nta(trK[index],trKL);
-    vec_store_nta(Xt1[index],Xt1L);
-    vec_store_nta(Xt2[index],Xt2L);
-    vec_store_nta(Xt3[index],Xt3L);
-  i += CCTK_REAL_VEC_SIZE-1;
+    A[index] = AL;
+    alpha[index] = alphaL;
+    At11[index] = At11L;
+    At12[index] = At12L;
+    At13[index] = At13L;
+    At22[index] = At22L;
+    At23[index] = At23L;
+    At33[index] = At33L;
+    B1[index] = B1L;
+    B2[index] = B2L;
+    B3[index] = B3L;
+    beta1[index] = beta1L;
+    beta2[index] = beta2L;
+    beta3[index] = beta3L;
+    gt11[index] = gt11L;
+    gt12[index] = gt12L;
+    gt13[index] = gt13L;
+    gt22[index] = gt22L;
+    gt23[index] = gt23L;
+    gt33[index] = gt33L;
+    phi[index] = phiL;
+    trK[index] = trKL;
+    Xt1[index] = Xt1L;
+    Xt2[index] = Xt2L;
+    Xt3[index] = Xt3L;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_Minkowski);
 }
 
-extern "C" void ML_BSSN_O8_Minkowski(CCTK_ARGUMENTS)
+void ML_BSSN_O8_Minkowski(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.c b/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.c
new file mode 100644
index 0000000..18e5a18
--- /dev/null
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.c
@@ -0,0 +1,1034 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "cctk.h"
+#include "cctk_Arguments.h"
+#include "cctk_Parameters.h"
+#include "GenericFD.h"
+#include "Differencing.h"
+#include "loopcontrol.h"
+
+/* Define macros used in calculations */
+#define INITVALUE  (42)
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+#define QAD(x) ((x) * (x) * (x) * (x))
+
+void ML_BSSN_O8_RHS1_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  
+  /* Declare finite differencing variables */
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_O8_RHS1_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_O8_RHS1_calc_every != ML_BSSN_O8_RHS1_calc_offset)
+  {
+    return;
+  }
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
+  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
+  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
+  int const di = 1;
+  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  CCTK_REAL const dxi = 1.0 / dx;
+  CCTK_REAL const dyi = 1.0 / dy;
+  CCTK_REAL const dzi = 1.0 / dz;
+  CCTK_REAL const khalf = 0.5;
+  CCTK_REAL const kthird = 1/3.0;
+  CCTK_REAL const ktwothird = 2.0/3.0;
+  CCTK_REAL const kfourthird = 4.0/3.0;
+  CCTK_REAL const keightthird = 8.0/3.0;
+  CCTK_REAL const hdxi = 0.5 * dxi;
+  CCTK_REAL const hdyi = 0.5 * dyi;
+  CCTK_REAL const hdzi = 0.5 * dzi;
+  
+  /* Initialize predefined quantities */
+  CCTK_REAL const p1o1024dx = INV(dx)/1024.;
+  CCTK_REAL const p1o1024dy = INV(dy)/1024.;
+  CCTK_REAL const p1o1024dz = INV(dz)/1024.;
+  CCTK_REAL const p1o1680dx = INV(dx)/1680.;
+  CCTK_REAL const p1o1680dy = INV(dy)/1680.;
+  CCTK_REAL const p1o1680dz = INV(dz)/1680.;
+  CCTK_REAL const p1o5040dx2 = pow(dx,-2)/5040.;
+  CCTK_REAL const p1o5040dy2 = pow(dy,-2)/5040.;
+  CCTK_REAL const p1o5040dz2 = pow(dz,-2)/5040.;
+  CCTK_REAL const p1o560dx = INV(dx)/560.;
+  CCTK_REAL const p1o560dy = INV(dy)/560.;
+  CCTK_REAL const p1o560dz = INV(dz)/560.;
+  CCTK_REAL const p1o705600dxdy = (INV(dx)*INV(dy))/705600.;
+  CCTK_REAL const p1o705600dxdz = (INV(dx)*INV(dz))/705600.;
+  CCTK_REAL const p1o705600dydz = (INV(dy)*INV(dz))/705600.;
+  CCTK_REAL const p1o840dx = INV(dx)/840.;
+  CCTK_REAL const p1o840dy = INV(dy)/840.;
+  CCTK_REAL const p1o840dz = INV(dz)/840.;
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o840dx = -INV(dx)/840.;
+  CCTK_REAL const pm1o840dy = -INV(dy)/840.;
+  CCTK_REAL const pm1o840dz = -INV(dz)/840.;
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_O8_RHS1,
+            i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    // int index = INITVALUE;
+    int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
+    /* Declare derivatives */
+    // CCTK_REAL PDdissipationNth1A = INITVALUE;
+    // CCTK_REAL PDdissipationNth2A = INITVALUE;
+    // CCTK_REAL PDdissipationNth3A = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1A = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1A = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2A = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2A = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3A = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3A = INITVALUE;
+    // CCTK_REAL PDstandardNth1alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth2alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth3alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth11alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth22alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth33alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth12alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth13alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth23alpha = INITVALUE;
+    // CCTK_REAL PDdissipationNth1alpha = INITVALUE;
+    // CCTK_REAL PDdissipationNth2alpha = INITVALUE;
+    // CCTK_REAL PDdissipationNth3alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3alpha = INITVALUE;
+    // CCTK_REAL PDdissipationNth1B1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2B1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3B1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1B1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1B1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2B1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2B1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3B1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3B1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1B2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2B2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3B2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1B2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1B2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2B2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2B2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3B2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3B2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1B3 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2B3 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3B3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1B3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1B3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2B3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2B3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3B3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3B3 = INITVALUE;
+    // CCTK_REAL PDstandardNth1beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth2beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth3beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth11beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth22beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth33beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth12beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth13beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth23beta1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1beta1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2beta1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth1beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth2beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth3beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth11beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth22beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth33beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth12beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth13beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth23beta2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1beta2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2beta2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth1beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth2beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth3beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth11beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth22beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth33beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth12beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth13beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth23beta3 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1beta3 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2beta3 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt11 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1gt11 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2gt11 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3gt11 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1gt11 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1gt11 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2gt11 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2gt11 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3gt11 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt12 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1gt12 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2gt12 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3gt12 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1gt12 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1gt12 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2gt12 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2gt12 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3gt12 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt13 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1gt13 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2gt13 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3gt13 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1gt13 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1gt13 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2gt13 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2gt13 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3gt13 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt22 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1gt22 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2gt22 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3gt22 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1gt22 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1gt22 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2gt22 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2gt22 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3gt22 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt23 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1gt23 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2gt23 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3gt23 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1gt23 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1gt23 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2gt23 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2gt23 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3gt23 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt33 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1gt33 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2gt33 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3gt33 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1gt33 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1gt33 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2gt33 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2gt33 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3gt33 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth1phi = INITVALUE;
+    // CCTK_REAL PDstandardNth2phi = INITVALUE;
+    // CCTK_REAL PDstandardNth3phi = INITVALUE;
+    // CCTK_REAL PDdissipationNth1phi = INITVALUE;
+    // CCTK_REAL PDdissipationNth2phi = INITVALUE;
+    // CCTK_REAL PDdissipationNth3phi = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1phi = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1phi = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2phi = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2phi = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3phi = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3phi = INITVALUE;
+    // CCTK_REAL PDstandardNth1trK = INITVALUE;
+    // CCTK_REAL PDstandardNth2trK = INITVALUE;
+    // CCTK_REAL PDstandardNth3trK = INITVALUE;
+    // CCTK_REAL PDdissipationNth1trK = INITVALUE;
+    // CCTK_REAL PDdissipationNth2trK = INITVALUE;
+    // CCTK_REAL PDdissipationNth3trK = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1trK = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1trK = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2trK = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2trK = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3trK = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3trK = INITVALUE;
+    // CCTK_REAL PDdissipationNth1Xt1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2Xt1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3Xt1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1Xt1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1Xt1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2Xt1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2Xt1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3Xt1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3Xt1 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1Xt2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2Xt2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3Xt2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1Xt2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1Xt2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2Xt2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2Xt2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3Xt2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3Xt2 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1Xt3 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2Xt3 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3Xt3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1Xt3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1Xt3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2Xt3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2Xt3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3Xt3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3Xt3 = INITVALUE;
+    
+    /* Assign local copies of grid functions */
+    CCTK_REAL  AL = A[index];
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  At11L = At11[index];
+    CCTK_REAL  At12L = At12[index];
+    CCTK_REAL  At13L = At13[index];
+    CCTK_REAL  At22L = At22[index];
+    CCTK_REAL  At23L = At23[index];
+    CCTK_REAL  At33L = At33[index];
+    CCTK_REAL  B1L = B1[index];
+    CCTK_REAL  B2L = B2[index];
+    CCTK_REAL  B3L = B3[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  eTttL = (*stress_energy_state) ? (eTtt[index]) : 0.0;
+    CCTK_REAL  eTtxL = (*stress_energy_state) ? (eTtx[index]) : 0.0;
+    CCTK_REAL  eTtyL = (*stress_energy_state) ? (eTty[index]) : 0.0;
+    CCTK_REAL  eTtzL = (*stress_energy_state) ? (eTtz[index]) : 0.0;
+    CCTK_REAL  eTxxL = (*stress_energy_state) ? (eTxx[index]) : 0.0;
+    CCTK_REAL  eTxyL = (*stress_energy_state) ? (eTxy[index]) : 0.0;
+    CCTK_REAL  eTxzL = (*stress_energy_state) ? (eTxz[index]) : 0.0;
+    CCTK_REAL  eTyyL = (*stress_energy_state) ? (eTyy[index]) : 0.0;
+    CCTK_REAL  eTyzL = (*stress_energy_state) ? (eTyz[index]) : 0.0;
+    CCTK_REAL  eTzzL = (*stress_energy_state) ? (eTzz[index]) : 0.0;
+    CCTK_REAL  gt11L = gt11[index];
+    CCTK_REAL  gt12L = gt12[index];
+    CCTK_REAL  gt13L = gt13[index];
+    CCTK_REAL  gt22L = gt22[index];
+    CCTK_REAL  gt23L = gt23[index];
+    CCTK_REAL  gt33L = gt33[index];
+    CCTK_REAL  phiL = phi[index];
+    CCTK_REAL  rL = r[index];
+    CCTK_REAL  trKL = trK[index];
+    CCTK_REAL  Xt1L = Xt1[index];
+    CCTK_REAL  Xt2L = Xt2[index];
+    CCTK_REAL  Xt3L = Xt3[index];
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    CCTK_REAL const PDdissipationNth1A = PDdissipationNth1(A, i, j, k);
+    CCTK_REAL const PDdissipationNth2A = PDdissipationNth2(A, i, j, k);
+    CCTK_REAL const PDdissipationNth3A = PDdissipationNth3(A, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1A = PDupwindNthAnti1(A, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1A = PDupwindNthSymm1(A, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2A = PDupwindNthAnti2(A, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2A = PDupwindNthSymm2(A, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3A = PDupwindNthAnti3(A, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3A = PDupwindNthSymm3(A, i, j, k);
+    CCTK_REAL const PDstandardNth1alpha = PDstandardNth1(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth2alpha = PDstandardNth2(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth3alpha = PDstandardNth3(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth11alpha = PDstandardNth11(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth22alpha = PDstandardNth22(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth33alpha = PDstandardNth33(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth12alpha = PDstandardNth12(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth13alpha = PDstandardNth13(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth23alpha = PDstandardNth23(alpha, i, j, k);
+    CCTK_REAL const PDdissipationNth1alpha = PDdissipationNth1(alpha, i, j, k);
+    CCTK_REAL const PDdissipationNth2alpha = PDdissipationNth2(alpha, i, j, k);
+    CCTK_REAL const PDdissipationNth3alpha = PDdissipationNth3(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1alpha = PDupwindNthAnti1(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1alpha = PDupwindNthSymm1(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2alpha = PDupwindNthAnti2(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2alpha = PDupwindNthSymm2(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3alpha = PDupwindNthAnti3(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3alpha = PDupwindNthSymm3(alpha, i, j, k);
+    CCTK_REAL const PDdissipationNth1B1 = PDdissipationNth1(B1, i, j, k);
+    CCTK_REAL const PDdissipationNth2B1 = PDdissipationNth2(B1, i, j, k);
+    CCTK_REAL const PDdissipationNth3B1 = PDdissipationNth3(B1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1B1 = PDupwindNthAnti1(B1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1B1 = PDupwindNthSymm1(B1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2B1 = PDupwindNthAnti2(B1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2B1 = PDupwindNthSymm2(B1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3B1 = PDupwindNthAnti3(B1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3B1 = PDupwindNthSymm3(B1, i, j, k);
+    CCTK_REAL const PDdissipationNth1B2 = PDdissipationNth1(B2, i, j, k);
+    CCTK_REAL const PDdissipationNth2B2 = PDdissipationNth2(B2, i, j, k);
+    CCTK_REAL const PDdissipationNth3B2 = PDdissipationNth3(B2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1B2 = PDupwindNthAnti1(B2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1B2 = PDupwindNthSymm1(B2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2B2 = PDupwindNthAnti2(B2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2B2 = PDupwindNthSymm2(B2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3B2 = PDupwindNthAnti3(B2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3B2 = PDupwindNthSymm3(B2, i, j, k);
+    CCTK_REAL const PDdissipationNth1B3 = PDdissipationNth1(B3, i, j, k);
+    CCTK_REAL const PDdissipationNth2B3 = PDdissipationNth2(B3, i, j, k);
+    CCTK_REAL const PDdissipationNth3B3 = PDdissipationNth3(B3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1B3 = PDupwindNthAnti1(B3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1B3 = PDupwindNthSymm1(B3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2B3 = PDupwindNthAnti2(B3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2B3 = PDupwindNthSymm2(B3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3B3 = PDupwindNthAnti3(B3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3B3 = PDupwindNthSymm3(B3, i, j, k);
+    CCTK_REAL const PDstandardNth1beta1 = PDstandardNth1(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth2beta1 = PDstandardNth2(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth3beta1 = PDstandardNth3(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth11beta1 = PDstandardNth11(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth22beta1 = PDstandardNth22(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth33beta1 = PDstandardNth33(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth12beta1 = PDstandardNth12(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth13beta1 = PDstandardNth13(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth23beta1 = PDstandardNth23(beta1, i, j, k);
+    CCTK_REAL const PDdissipationNth1beta1 = PDdissipationNth1(beta1, i, j, k);
+    CCTK_REAL const PDdissipationNth2beta1 = PDdissipationNth2(beta1, i, j, k);
+    CCTK_REAL const PDdissipationNth3beta1 = PDdissipationNth3(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta1 = PDupwindNthAnti1(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta1 = PDupwindNthSymm1(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta1 = PDupwindNthAnti2(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta1 = PDupwindNthSymm2(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta1 = PDupwindNthAnti3(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta1 = PDupwindNthSymm3(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth1beta2 = PDstandardNth1(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth2beta2 = PDstandardNth2(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth3beta2 = PDstandardNth3(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth11beta2 = PDstandardNth11(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth22beta2 = PDstandardNth22(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth33beta2 = PDstandardNth33(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth12beta2 = PDstandardNth12(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth13beta2 = PDstandardNth13(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth23beta2 = PDstandardNth23(beta2, i, j, k);
+    CCTK_REAL const PDdissipationNth1beta2 = PDdissipationNth1(beta2, i, j, k);
+    CCTK_REAL const PDdissipationNth2beta2 = PDdissipationNth2(beta2, i, j, k);
+    CCTK_REAL const PDdissipationNth3beta2 = PDdissipationNth3(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta2 = PDupwindNthAnti1(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta2 = PDupwindNthSymm1(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta2 = PDupwindNthAnti2(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta2 = PDupwindNthSymm2(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta2 = PDupwindNthAnti3(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta2 = PDupwindNthSymm3(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth1beta3 = PDstandardNth1(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth2beta3 = PDstandardNth2(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth3beta3 = PDstandardNth3(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth11beta3 = PDstandardNth11(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth22beta3 = PDstandardNth22(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth33beta3 = PDstandardNth33(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth12beta3 = PDstandardNth12(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth13beta3 = PDstandardNth13(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth23beta3 = PDstandardNth23(beta3, i, j, k);
+    CCTK_REAL const PDdissipationNth1beta3 = PDdissipationNth1(beta3, i, j, k);
+    CCTK_REAL const PDdissipationNth2beta3 = PDdissipationNth2(beta3, i, j, k);
+    CCTK_REAL const PDdissipationNth3beta3 = PDdissipationNth3(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta3 = PDupwindNthAnti1(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta3 = PDupwindNthSymm1(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta3 = PDupwindNthAnti2(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta3 = PDupwindNthSymm2(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta3 = PDupwindNthAnti3(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta3 = PDupwindNthSymm3(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
+    CCTK_REAL const PDdissipationNth1gt11 = PDdissipationNth1(gt11, i, j, k);
+    CCTK_REAL const PDdissipationNth2gt11 = PDdissipationNth2(gt11, i, j, k);
+    CCTK_REAL const PDdissipationNth3gt11 = PDdissipationNth3(gt11, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1gt11 = PDupwindNthAnti1(gt11, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1gt11 = PDupwindNthSymm1(gt11, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2gt11 = PDupwindNthAnti2(gt11, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2gt11 = PDupwindNthSymm2(gt11, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3gt11 = PDupwindNthAnti3(gt11, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3gt11 = PDupwindNthSymm3(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth1gt12 = PDstandardNth1(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth2gt12 = PDstandardNth2(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth3gt12 = PDstandardNth3(gt12, i, j, k);
+    CCTK_REAL const PDdissipationNth1gt12 = PDdissipationNth1(gt12, i, j, k);
+    CCTK_REAL const PDdissipationNth2gt12 = PDdissipationNth2(gt12, i, j, k);
+    CCTK_REAL const PDdissipationNth3gt12 = PDdissipationNth3(gt12, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1gt12 = PDupwindNthAnti1(gt12, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1gt12 = PDupwindNthSymm1(gt12, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2gt12 = PDupwindNthAnti2(gt12, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2gt12 = PDupwindNthSymm2(gt12, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3gt12 = PDupwindNthAnti3(gt12, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3gt12 = PDupwindNthSymm3(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth1gt13 = PDstandardNth1(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth2gt13 = PDstandardNth2(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth3gt13 = PDstandardNth3(gt13, i, j, k);
+    CCTK_REAL const PDdissipationNth1gt13 = PDdissipationNth1(gt13, i, j, k);
+    CCTK_REAL const PDdissipationNth2gt13 = PDdissipationNth2(gt13, i, j, k);
+    CCTK_REAL const PDdissipationNth3gt13 = PDdissipationNth3(gt13, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1gt13 = PDupwindNthAnti1(gt13, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1gt13 = PDupwindNthSymm1(gt13, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2gt13 = PDupwindNthAnti2(gt13, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2gt13 = PDupwindNthSymm2(gt13, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3gt13 = PDupwindNthAnti3(gt13, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3gt13 = PDupwindNthSymm3(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth1gt22 = PDstandardNth1(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth2gt22 = PDstandardNth2(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth3gt22 = PDstandardNth3(gt22, i, j, k);
+    CCTK_REAL const PDdissipationNth1gt22 = PDdissipationNth1(gt22, i, j, k);
+    CCTK_REAL const PDdissipationNth2gt22 = PDdissipationNth2(gt22, i, j, k);
+    CCTK_REAL const PDdissipationNth3gt22 = PDdissipationNth3(gt22, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1gt22 = PDupwindNthAnti1(gt22, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1gt22 = PDupwindNthSymm1(gt22, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2gt22 = PDupwindNthAnti2(gt22, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2gt22 = PDupwindNthSymm2(gt22, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3gt22 = PDupwindNthAnti3(gt22, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3gt22 = PDupwindNthSymm3(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth1gt23 = PDstandardNth1(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth2gt23 = PDstandardNth2(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth3gt23 = PDstandardNth3(gt23, i, j, k);
+    CCTK_REAL const PDdissipationNth1gt23 = PDdissipationNth1(gt23, i, j, k);
+    CCTK_REAL const PDdissipationNth2gt23 = PDdissipationNth2(gt23, i, j, k);
+    CCTK_REAL const PDdissipationNth3gt23 = PDdissipationNth3(gt23, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1gt23 = PDupwindNthAnti1(gt23, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1gt23 = PDupwindNthSymm1(gt23, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2gt23 = PDupwindNthAnti2(gt23, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2gt23 = PDupwindNthSymm2(gt23, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3gt23 = PDupwindNthAnti3(gt23, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3gt23 = PDupwindNthSymm3(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth1gt33 = PDstandardNth1(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
+    CCTK_REAL const PDdissipationNth1gt33 = PDdissipationNth1(gt33, i, j, k);
+    CCTK_REAL const PDdissipationNth2gt33 = PDdissipationNth2(gt33, i, j, k);
+    CCTK_REAL const PDdissipationNth3gt33 = PDdissipationNth3(gt33, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1gt33 = PDupwindNthAnti1(gt33, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1gt33 = PDupwindNthSymm1(gt33, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2gt33 = PDupwindNthAnti2(gt33, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2gt33 = PDupwindNthSymm2(gt33, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3gt33 = PDupwindNthAnti3(gt33, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3gt33 = PDupwindNthSymm3(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth1phi = PDstandardNth1(phi, i, j, k);
+    CCTK_REAL const PDstandardNth2phi = PDstandardNth2(phi, i, j, k);
+    CCTK_REAL const PDstandardNth3phi = PDstandardNth3(phi, i, j, k);
+    CCTK_REAL const PDdissipationNth1phi = PDdissipationNth1(phi, i, j, k);
+    CCTK_REAL const PDdissipationNth2phi = PDdissipationNth2(phi, i, j, k);
+    CCTK_REAL const PDdissipationNth3phi = PDdissipationNth3(phi, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1phi = PDupwindNthAnti1(phi, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1phi = PDupwindNthSymm1(phi, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2phi = PDupwindNthAnti2(phi, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2phi = PDupwindNthSymm2(phi, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3phi = PDupwindNthAnti3(phi, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3phi = PDupwindNthSymm3(phi, i, j, k);
+    CCTK_REAL const PDstandardNth1trK = PDstandardNth1(trK, i, j, k);
+    CCTK_REAL const PDstandardNth2trK = PDstandardNth2(trK, i, j, k);
+    CCTK_REAL const PDstandardNth3trK = PDstandardNth3(trK, i, j, k);
+    CCTK_REAL const PDdissipationNth1trK = PDdissipationNth1(trK, i, j, k);
+    CCTK_REAL const PDdissipationNth2trK = PDdissipationNth2(trK, i, j, k);
+    CCTK_REAL const PDdissipationNth3trK = PDdissipationNth3(trK, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1trK = PDupwindNthAnti1(trK, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1trK = PDupwindNthSymm1(trK, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2trK = PDupwindNthAnti2(trK, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2trK = PDupwindNthSymm2(trK, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3trK = PDupwindNthAnti3(trK, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3trK = PDupwindNthSymm3(trK, i, j, k);
+    CCTK_REAL const PDdissipationNth1Xt1 = PDdissipationNth1(Xt1, i, j, k);
+    CCTK_REAL const PDdissipationNth2Xt1 = PDdissipationNth2(Xt1, i, j, k);
+    CCTK_REAL const PDdissipationNth3Xt1 = PDdissipationNth3(Xt1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1Xt1 = PDupwindNthAnti1(Xt1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1Xt1 = PDupwindNthSymm1(Xt1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2Xt1 = PDupwindNthAnti2(Xt1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2Xt1 = PDupwindNthSymm2(Xt1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3Xt1 = PDupwindNthAnti3(Xt1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3Xt1 = PDupwindNthSymm3(Xt1, i, j, k);
+    CCTK_REAL const PDdissipationNth1Xt2 = PDdissipationNth1(Xt2, i, j, k);
+    CCTK_REAL const PDdissipationNth2Xt2 = PDdissipationNth2(Xt2, i, j, k);
+    CCTK_REAL const PDdissipationNth3Xt2 = PDdissipationNth3(Xt2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1Xt2 = PDupwindNthAnti1(Xt2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1Xt2 = PDupwindNthSymm1(Xt2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2Xt2 = PDupwindNthAnti2(Xt2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2Xt2 = PDupwindNthSymm2(Xt2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3Xt2 = PDupwindNthAnti3(Xt2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3Xt2 = PDupwindNthSymm3(Xt2, i, j, k);
+    CCTK_REAL const PDdissipationNth1Xt3 = PDdissipationNth1(Xt3, i, j, k);
+    CCTK_REAL const PDdissipationNth2Xt3 = PDdissipationNth2(Xt3, i, j, k);
+    CCTK_REAL const PDdissipationNth3Xt3 = PDdissipationNth3(Xt3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1Xt3 = PDupwindNthAnti1(Xt3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1Xt3 = PDupwindNthSymm1(Xt3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2Xt3 = PDupwindNthAnti2(Xt3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2Xt3 = PDupwindNthSymm2(Xt3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3Xt3 = PDupwindNthAnti3(Xt3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3Xt3 = PDupwindNthSymm3(Xt3, i, j, k);
+    
+    /* Calculate temporaries and grid functions */
+    int dir1 = Sign(beta1L);
+    
+    int dir2 = Sign(beta2L);
+    
+    int dir3 = Sign(beta3L);
+    
+    CCTK_REAL epsdiss1 = EpsDiss;
+    
+    CCTK_REAL epsdiss2 = EpsDiss;
+    
+    CCTK_REAL epsdiss3 = EpsDiss;
+    
+    CCTK_REAL detgt = 1;
+    
+    CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
+    
+    CCTK_REAL gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
+    
+    CCTK_REAL gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
+    
+    CCTK_REAL gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
+    
+    CCTK_REAL gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
+    
+    CCTK_REAL gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
+    
+    CCTK_REAL Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
+      2*(gtu21*PDstandardNth1gt12 + gtu31*PDstandardNth1gt13) - 
+      gtu21*PDstandardNth2gt11 - gtu31*PDstandardNth3gt11);
+    
+    CCTK_REAL Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
+      2*(gtu22*PDstandardNth1gt12 + gtu32*PDstandardNth1gt13) - 
+      gtu22*PDstandardNth2gt11 - gtu32*PDstandardNth3gt11);
+    
+    CCTK_REAL Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
+      2*(gtu32*PDstandardNth1gt12 + gtu33*PDstandardNth1gt13) - 
+      gtu32*PDstandardNth2gt11 - gtu33*PDstandardNth3gt11);
+    
+    CCTK_REAL Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
+      gtu11*PDstandardNth2gt11 + gtu31*(PDstandardNth1gt23 + 
+      PDstandardNth2gt13 - PDstandardNth3gt12));
+    
+    CCTK_REAL Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
+      gtu21*PDstandardNth2gt11 + gtu32*(PDstandardNth1gt23 + 
+      PDstandardNth2gt13 - PDstandardNth3gt12));
+    
+    CCTK_REAL Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
+      gtu31*PDstandardNth2gt11 + gtu33*(PDstandardNth1gt23 + 
+      PDstandardNth2gt13 - PDstandardNth3gt12));
+    
+    CCTK_REAL Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
+      gtu11*PDstandardNth3gt11 + gtu21*(PDstandardNth1gt23 - 
+      PDstandardNth2gt13 + PDstandardNth3gt12));
+    
+    CCTK_REAL Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
+      gtu21*PDstandardNth3gt11 + gtu22*(PDstandardNth1gt23 - 
+      PDstandardNth2gt13 + PDstandardNth3gt12));
+    
+    CCTK_REAL Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
+      gtu31*PDstandardNth3gt11 + gtu32*(PDstandardNth1gt23 - 
+      PDstandardNth2gt13 + PDstandardNth3gt12));
+    
+    CCTK_REAL Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
+      2*PDstandardNth2gt12) + gtu21*PDstandardNth2gt22 + 
+      gtu31*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
+    
+    CCTK_REAL Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
+      2*PDstandardNth2gt12) + gtu22*PDstandardNth2gt22 + 
+      gtu32*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
+    
+    CCTK_REAL Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
+      2*PDstandardNth2gt12) + gtu32*PDstandardNth2gt22 + 
+      gtu33*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
+    
+    CCTK_REAL Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
+      gtu11*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
+      gtu21*PDstandardNth3gt22);
+    
+    CCTK_REAL Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
+      gtu21*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
+      gtu22*PDstandardNth3gt22);
+    
+    CCTK_REAL Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
+      gtu31*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
+      gtu32*PDstandardNth3gt22);
+    
+    CCTK_REAL Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
+      gtu21*PDstandardNth2gt33 + 2*gtu11*PDstandardNth3gt13 + 
+      2*gtu21*PDstandardNth3gt23 + gtu31*PDstandardNth3gt33);
+    
+    CCTK_REAL Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
+      gtu22*PDstandardNth2gt33 + 2*gtu21*PDstandardNth3gt13 + 
+      2*gtu22*PDstandardNth3gt23 + gtu32*PDstandardNth3gt33);
+    
+    CCTK_REAL Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
+      gtu32*PDstandardNth2gt33 + 2*gtu31*PDstandardNth3gt13 + 
+      2*gtu32*PDstandardNth3gt23 + gtu33*PDstandardNth3gt33);
+    
+    CCTK_REAL Xtn1 = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
+      Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33;
+    
+    CCTK_REAL Xtn2 = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
+      Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33;
+    
+    CCTK_REAL Xtn3 = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
+      Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
+    
+    CCTK_REAL fac1 = IfThen(conformalMethod,-(khalf*INV(phiL)),1);
+    
+    CCTK_REAL cdphi1 = fac1*PDstandardNth1phi;
+    
+    CCTK_REAL cdphi2 = fac1*PDstandardNth2phi;
+    
+    CCTK_REAL cdphi3 = fac1*PDstandardNth3phi;
+    
+    CCTK_REAL Atm11 = At11L*gtu11 + At12L*gtu21 + At13L*gtu31;
+    
+    CCTK_REAL Atm21 = At11L*gtu21 + At12L*gtu22 + At13L*gtu32;
+    
+    CCTK_REAL Atm31 = At11L*gtu31 + At12L*gtu32 + At13L*gtu33;
+    
+    CCTK_REAL Atm12 = At12L*gtu11 + At22L*gtu21 + At23L*gtu31;
+    
+    CCTK_REAL Atm22 = At12L*gtu21 + At22L*gtu22 + At23L*gtu32;
+    
+    CCTK_REAL Atm32 = At12L*gtu31 + At22L*gtu32 + At23L*gtu33;
+    
+    CCTK_REAL Atm13 = At13L*gtu11 + At23L*gtu21 + At33L*gtu31;
+    
+    CCTK_REAL Atm23 = At13L*gtu21 + At23L*gtu22 + At33L*gtu32;
+    
+    CCTK_REAL Atm33 = At13L*gtu31 + At23L*gtu32 + At33L*gtu33;
+    
+    CCTK_REAL Atu11 = Atm11*gtu11 + Atm12*gtu21 + Atm13*gtu31;
+    
+    CCTK_REAL Atu21 = Atm11*gtu21 + Atm12*gtu22 + Atm13*gtu32;
+    
+    CCTK_REAL Atu31 = Atm11*gtu31 + Atm12*gtu32 + Atm13*gtu33;
+    
+    CCTK_REAL Atu22 = Atm21*gtu21 + Atm22*gtu22 + Atm23*gtu32;
+    
+    CCTK_REAL Atu32 = Atm21*gtu31 + Atm22*gtu32 + Atm23*gtu33;
+    
+    CCTK_REAL Atu33 = Atm31*gtu31 + Atm32*gtu32 + Atm33*gtu33;
+    
+    CCTK_REAL e4phi = IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
+    
+    CCTK_REAL em4phi = INV(e4phi);
+    
+    CCTK_REAL rho = pow(alphaL,-2)*(eTttL - 2*(beta2L*eTtyL + 
+      beta3L*eTtzL) + 2*(beta1L*(-eTtxL + beta2L*eTxyL + beta3L*eTxzL) + 
+      beta2L*beta3L*eTyzL) + eTxxL*SQR(beta1L) + eTyyL*SQR(beta2L) + 
+      eTzzL*SQR(beta3L));
+    
+    CCTK_REAL S1 = (-eTtxL + beta1L*eTxxL + beta2L*eTxyL + 
+      beta3L*eTxzL)*INV(alphaL);
+    
+    CCTK_REAL S2 = (-eTtyL + beta1L*eTxyL + beta2L*eTyyL + 
+      beta3L*eTyzL)*INV(alphaL);
+    
+    CCTK_REAL S3 = (-eTtzL + beta1L*eTxzL + beta2L*eTyzL + 
+      beta3L*eTzzL)*INV(alphaL);
+    
+    CCTK_REAL trS = em4phi*(eTxxL*gtu11 + eTyyL*gtu22 + 2*(eTxyL*gtu21 + 
+      eTxzL*gtu31 + eTyzL*gtu32) + eTzzL*gtu33);
+    
+    CCTK_REAL phirhsL = epsdiss1*PDdissipationNth1phi + 
+      epsdiss2*PDdissipationNth2phi + epsdiss3*PDdissipationNth3phi + 
+      beta1L*PDupwindNthAnti1phi + beta2L*PDupwindNthAnti2phi + 
+      beta3L*PDupwindNthAnti3phi + PDupwindNthSymm1phi*Abs(beta1L) + 
+      PDupwindNthSymm2phi*Abs(beta2L) + PDupwindNthSymm3phi*Abs(beta3L) + 
+      (PDstandardNth1beta1 + PDstandardNth2beta2 + 
+      PDstandardNth3beta3)*IfThen(conformalMethod,-(kthird*phiL),0.16666666666666666) 
+      + alphaL*trKL*IfThen(conformalMethod,kthird*phiL,-0.16666666666666666);
+    
+    CCTK_REAL gt11rhsL = -2*alphaL*At11L + epsdiss1*PDdissipationNth1gt11 
+      + epsdiss2*PDdissipationNth2gt11 + epsdiss3*PDdissipationNth3gt11 + 
+      2*(gt12L*PDstandardNth1beta2 + gt13L*PDstandardNth1beta3) + 
+      gt11L*(kfourthird*PDstandardNth1beta1 - ktwothird*PDstandardNth2beta2 - 
+      ktwothird*PDstandardNth3beta3) + beta1L*PDupwindNthAnti1gt11 + 
+      beta2L*PDupwindNthAnti2gt11 + beta3L*PDupwindNthAnti3gt11 + 
+      PDupwindNthSymm1gt11*Abs(beta1L) + PDupwindNthSymm2gt11*Abs(beta2L) + 
+      PDupwindNthSymm3gt11*Abs(beta3L);
+    
+    CCTK_REAL gt12rhsL = -2*alphaL*At12L + epsdiss1*PDdissipationNth1gt12 
+      + epsdiss2*PDdissipationNth2gt12 + epsdiss3*PDdissipationNth3gt12 + 
+      gt22L*PDstandardNth1beta2 + gt23L*PDstandardNth1beta3 + 
+      gt11L*PDstandardNth2beta1 + gt13L*PDstandardNth2beta3 + 
+      gt12L*(kthird*(PDstandardNth1beta1 + PDstandardNth2beta2) - 
+      ktwothird*PDstandardNth3beta3) + beta1L*PDupwindNthAnti1gt12 + 
+      beta2L*PDupwindNthAnti2gt12 + beta3L*PDupwindNthAnti3gt12 + 
+      PDupwindNthSymm1gt12*Abs(beta1L) + PDupwindNthSymm2gt12*Abs(beta2L) + 
+      PDupwindNthSymm3gt12*Abs(beta3L);
+    
+    CCTK_REAL gt13rhsL = -2*alphaL*At13L + epsdiss1*PDdissipationNth1gt13 
+      + epsdiss2*PDdissipationNth2gt13 + epsdiss3*PDdissipationNth3gt13 + 
+      gt23L*PDstandardNth1beta2 + gt33L*PDstandardNth1beta3 + 
+      gt11L*PDstandardNth3beta1 + gt12L*PDstandardNth3beta2 + 
+      gt13L*(-(ktwothird*PDstandardNth2beta2) + kthird*(PDstandardNth1beta1 + 
+      PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt13 + 
+      beta2L*PDupwindNthAnti2gt13 + beta3L*PDupwindNthAnti3gt13 + 
+      PDupwindNthSymm1gt13*Abs(beta1L) + PDupwindNthSymm2gt13*Abs(beta2L) + 
+      PDupwindNthSymm3gt13*Abs(beta3L);
+    
+    CCTK_REAL gt22rhsL = -2*alphaL*At22L + epsdiss1*PDdissipationNth1gt22 
+      + epsdiss2*PDdissipationNth2gt22 + epsdiss3*PDdissipationNth3gt22 + 
+      2*(gt12L*PDstandardNth2beta1 + gt23L*PDstandardNth2beta3) + 
+      gt22L*(-(ktwothird*PDstandardNth1beta1) + 
+      kfourthird*PDstandardNth2beta2 - ktwothird*PDstandardNth3beta3) + 
+      beta1L*PDupwindNthAnti1gt22 + beta2L*PDupwindNthAnti2gt22 + 
+      beta3L*PDupwindNthAnti3gt22 + PDupwindNthSymm1gt22*Abs(beta1L) + 
+      PDupwindNthSymm2gt22*Abs(beta2L) + PDupwindNthSymm3gt22*Abs(beta3L);
+    
+    CCTK_REAL gt23rhsL = -2*alphaL*At23L + epsdiss1*PDdissipationNth1gt23 
+      + epsdiss2*PDdissipationNth2gt23 + epsdiss3*PDdissipationNth3gt23 + 
+      gt13L*PDstandardNth2beta1 + gt33L*PDstandardNth2beta3 + 
+      gt12L*PDstandardNth3beta1 + gt22L*PDstandardNth3beta2 + 
+      gt23L*(-(ktwothird*PDstandardNth1beta1) + kthird*(PDstandardNth2beta2 + 
+      PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt23 + 
+      beta2L*PDupwindNthAnti2gt23 + beta3L*PDupwindNthAnti3gt23 + 
+      PDupwindNthSymm1gt23*Abs(beta1L) + PDupwindNthSymm2gt23*Abs(beta2L) + 
+      PDupwindNthSymm3gt23*Abs(beta3L);
+    
+    CCTK_REAL gt33rhsL = -2*alphaL*At33L + epsdiss1*PDdissipationNth1gt33 
+      + epsdiss2*PDdissipationNth2gt33 + epsdiss3*PDdissipationNth3gt33 - 
+      gt33L*ktwothird*PDstandardNth1beta1 - 
+      gt33L*ktwothird*PDstandardNth2beta2 + 2*gt13L*PDstandardNth3beta1 + 
+      2*gt23L*PDstandardNth3beta2 + gt33L*kfourthird*PDstandardNth3beta3 + 
+      beta1L*PDupwindNthAnti1gt33 + beta2L*PDupwindNthAnti2gt33 + 
+      beta3L*PDupwindNthAnti3gt33 + PDupwindNthSymm1gt33*Abs(beta1L) + 
+      PDupwindNthSymm2gt33*Abs(beta2L) + PDupwindNthSymm3gt33*Abs(beta3L);
+    
+    CCTK_REAL dotXt1 = kthird*(7*(gtu21*PDstandardNth12beta1 + 
+      gtu31*PDstandardNth13beta1) + gtu11*(4*PDstandardNth11beta1 + 
+      PDstandardNth12beta2 + PDstandardNth13beta3) + 
+      gtu21*(PDstandardNth22beta2 + PDstandardNth23beta3) + 
+      gtu31*(PDstandardNth23beta2 + PDstandardNth33beta3) - 
+      6*(Atu11*PDstandardNth1alpha + Atu21*PDstandardNth2alpha + 
+      Atu31*PDstandardNth3alpha) + 6*(gtu32*PDstandardNth23beta1 + 
+      alphaL*(6*(Atu11*cdphi1 + Atu21*cdphi2 + Atu31*cdphi3) + Atu11*Gt111 + 
+      Atu22*Gt122 + 2*(Atu21*Gt112 + Atu31*Gt113 + Atu32*Gt123) + Atu33*Gt133 
+      - ktwothird*(gtu11*PDstandardNth1trK + gtu21*PDstandardNth2trK + 
+      gtu31*PDstandardNth3trK))) - 
+      150.7964473723100754462068823974161384415*alphaL*(gtu11*S1 + gtu21*S2 + 
+      gtu31*S3) + (-3*PDstandardNth1beta1 + 2*(PDstandardNth1beta1 + 
+      PDstandardNth2beta2 + PDstandardNth3beta3))*Xtn1 - 
+      3*(PDstandardNth2beta1*Xtn2 + PDstandardNth3beta1*Xtn3) + 
+      3*(epsdiss1*PDdissipationNth1Xt1 + epsdiss2*PDdissipationNth2Xt1 + 
+      epsdiss3*PDdissipationNth3Xt1 + gtu22*PDstandardNth22beta1 + 
+      gtu33*PDstandardNth33beta1 + beta1L*PDupwindNthAnti1Xt1 + 
+      beta2L*PDupwindNthAnti2Xt1 + beta3L*PDupwindNthAnti3Xt1 + 
+      PDupwindNthSymm1Xt1*Abs(beta1L) + PDupwindNthSymm2Xt1*Abs(beta2L) + 
+      PDupwindNthSymm3Xt1*Abs(beta3L)));
+    
+    CCTK_REAL dotXt2 = kthird*(gtu21*(PDstandardNth11beta1 + 
+      7*PDstandardNth12beta2 + PDstandardNth13beta3) + 
+      gtu22*(PDstandardNth12beta1 + 4*PDstandardNth22beta2 + 
+      PDstandardNth23beta3) + gtu32*(PDstandardNth13beta1 + 
+      7*PDstandardNth23beta2 + PDstandardNth33beta3) - 
+      6*(Atu21*PDstandardNth1alpha + Atu22*PDstandardNth2alpha + 
+      Atu32*PDstandardNth3alpha) + 6*(gtu31*PDstandardNth13beta2 + 
+      alphaL*(6*(Atu21*cdphi1 + Atu22*cdphi2 + Atu32*cdphi3) + Atu11*Gt211 + 
+      Atu22*Gt222 + 2*(Atu21*Gt212 + Atu31*Gt213 + Atu32*Gt223) + Atu33*Gt233 
+      - ktwothird*(gtu21*PDstandardNth1trK + gtu22*PDstandardNth2trK + 
+      gtu32*PDstandardNth3trK))) - 
+      150.7964473723100754462068823974161384415*alphaL*(gtu21*S1 + gtu22*S2 + 
+      gtu32*S3) + 2*(PDstandardNth1beta1 + PDstandardNth2beta2 + 
+      PDstandardNth3beta3)*Xtn2 - 3*(PDstandardNth1beta2*Xtn1 + 
+      PDstandardNth2beta2*Xtn2 + PDstandardNth3beta2*Xtn3) + 
+      3*(epsdiss1*PDdissipationNth1Xt2 + epsdiss2*PDdissipationNth2Xt2 + 
+      epsdiss3*PDdissipationNth3Xt2 + gtu11*PDstandardNth11beta2 + 
+      gtu33*PDstandardNth33beta2 + beta1L*PDupwindNthAnti1Xt2 + 
+      beta2L*PDupwindNthAnti2Xt2 + beta3L*PDupwindNthAnti3Xt2 + 
+      PDupwindNthSymm1Xt2*Abs(beta1L) + PDupwindNthSymm2Xt2*Abs(beta2L) + 
+      PDupwindNthSymm3Xt2*Abs(beta3L)));
+    
+    CCTK_REAL dotXt3 = kthird*(gtu31*(PDstandardNth11beta1 + 
+      PDstandardNth12beta2 + 7*PDstandardNth13beta3) + 
+      gtu32*(PDstandardNth12beta1 + PDstandardNth22beta2 + 
+      7*PDstandardNth23beta3) + gtu33*(PDstandardNth13beta1 + 
+      PDstandardNth23beta2 + 4*PDstandardNth33beta3) - 
+      6*(Atu31*PDstandardNth1alpha + Atu32*PDstandardNth2alpha + 
+      Atu33*PDstandardNth3alpha) + 6*(gtu21*PDstandardNth12beta3 + 
+      alphaL*(6*(Atu31*cdphi1 + Atu32*cdphi2 + Atu33*cdphi3) + Atu11*Gt311 + 
+      Atu22*Gt322 + 2*(Atu21*Gt312 + Atu31*Gt313 + Atu32*Gt323) + Atu33*Gt333 
+      - ktwothird*(gtu31*PDstandardNth1trK + gtu32*PDstandardNth2trK + 
+      gtu33*PDstandardNth3trK))) - 
+      150.7964473723100754462068823974161384415*alphaL*(gtu31*S1 + gtu32*S2 + 
+      gtu33*S3) + 2*(PDstandardNth1beta1 + PDstandardNth2beta2 + 
+      PDstandardNth3beta3)*Xtn3 - 3*(PDstandardNth1beta3*Xtn1 + 
+      PDstandardNth2beta3*Xtn2 + PDstandardNth3beta3*Xtn3) + 
+      3*(epsdiss1*PDdissipationNth1Xt3 + epsdiss2*PDdissipationNth2Xt3 + 
+      epsdiss3*PDdissipationNth3Xt3 + gtu11*PDstandardNth11beta3 + 
+      gtu22*PDstandardNth22beta3 + beta1L*PDupwindNthAnti1Xt3 + 
+      beta2L*PDupwindNthAnti2Xt3 + beta3L*PDupwindNthAnti3Xt3 + 
+      PDupwindNthSymm1Xt3*Abs(beta1L) + PDupwindNthSymm2Xt3*Abs(beta2L) + 
+      PDupwindNthSymm3Xt3*Abs(beta3L)));
+    
+    CCTK_REAL Xt1rhsL = dotXt1;
+    
+    CCTK_REAL Xt2rhsL = dotXt2;
+    
+    CCTK_REAL Xt3rhsL = dotXt3;
+    
+    CCTK_REAL dottrK = epsdiss1*PDdissipationNth1trK + 
+      epsdiss2*PDdissipationNth2trK + epsdiss3*PDdissipationNth3trK + 
+      beta1L*PDupwindNthAnti1trK + beta2L*PDupwindNthAnti2trK + 
+      beta3L*PDupwindNthAnti3trK - em4phi*(gtu11*PDstandardNth11alpha + 
+      gtu22*PDstandardNth22alpha + gtu33*(PDstandardNth33alpha + 
+      2*cdphi3*PDstandardNth3alpha) + 2*(gtu21*PDstandardNth12alpha + 
+      gtu31*(PDstandardNth13alpha + cdphi1*PDstandardNth3alpha) + 
+      gtu32*(PDstandardNth23alpha + cdphi2*PDstandardNth3alpha)) + 
+      PDstandardNth1alpha*(2*(cdphi1*gtu11 + cdphi2*gtu21 + cdphi3*gtu31) - 
+      Xtn1) + PDstandardNth2alpha*(2*(cdphi1*gtu21 + cdphi2*gtu22 + 
+      cdphi3*gtu32) - Xtn2) - PDstandardNth3alpha*Xtn3) + 
+      PDupwindNthSymm1trK*Abs(beta1L) + PDupwindNthSymm2trK*Abs(beta2L) + 
+      PDupwindNthSymm3trK*Abs(beta3L) + alphaL*(2*(Atm12*Atm21 + Atm13*Atm31 
+      + Atm23*Atm32) + 12.56637061435917295385057353311801153679*(rho + trS) 
+      + SQR(Atm11) + SQR(Atm22) + SQR(Atm33) + kthird*SQR(trKL));
+    
+    CCTK_REAL trKrhsL = dottrK;
+    
+    CCTK_REAL alpharhsL = epsdiss1*PDdissipationNth1alpha + 
+      epsdiss2*PDdissipationNth2alpha + epsdiss3*PDdissipationNth3alpha + 
+      LapseAdvectionCoeff*(beta1L*PDupwindNthAnti1alpha + 
+      beta2L*PDupwindNthAnti2alpha + beta3L*PDupwindNthAnti3alpha + 
+      PDupwindNthSymm1alpha*Abs(beta1L) + PDupwindNthSymm2alpha*Abs(beta2L) + 
+      PDupwindNthSymm3alpha*Abs(beta3L)) - harmonicF*(LapseACoeff*(AL - trKL) 
+      + trKL)*pow(alphaL,harmonicN);
+    
+    CCTK_REAL ArhsL = (-(AL*AlphaDriver) + dottrK)*LapseACoeff + 
+      epsdiss1*PDdissipationNth1A + epsdiss2*PDdissipationNth2A + 
+      epsdiss3*PDdissipationNth3A + 
+      LapseAdvectionCoeff*(beta1L*PDupwindNthAnti1A + 
+      beta2L*PDupwindNthAnti2A + beta3L*PDupwindNthAnti3A + 
+      PDupwindNthSymm1A*Abs(beta1L) + PDupwindNthSymm2A*Abs(beta2L) + 
+      PDupwindNthSymm3A*Abs(beta3L));
+    
+    CCTK_REAL eta = fmin(1,SpatialBetaDriverRadius*INV(rL));
+    
+    CCTK_REAL theta = fmin(1,exp(1 - 
+      rL*INV(SpatialShiftGammaCoeffRadius)));
+    
+    CCTK_REAL beta1rhsL = epsdiss1*PDdissipationNth1beta1 + 
+      epsdiss2*PDdissipationNth2beta1 + epsdiss3*PDdissipationNth3beta1 + 
+      ShiftGammaCoeff*theta*(beta1L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
+      ShiftBCoeff*(B1L - Xt1L) + Xt1L) + 
+      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta1 + 
+      beta2L*PDupwindNthAnti2beta1 + beta3L*PDupwindNthAnti3beta1 + 
+      PDupwindNthSymm1beta1*Abs(beta1L) + PDupwindNthSymm2beta1*Abs(beta2L) + 
+      PDupwindNthSymm3beta1*Abs(beta3L));
+    
+    CCTK_REAL beta2rhsL = epsdiss1*PDdissipationNth1beta2 + 
+      epsdiss2*PDdissipationNth2beta2 + epsdiss3*PDdissipationNth3beta2 + 
+      ShiftGammaCoeff*theta*(beta2L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
+      ShiftBCoeff*(B2L - Xt2L) + Xt2L) + 
+      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta2 + 
+      beta2L*PDupwindNthAnti2beta2 + beta3L*PDupwindNthAnti3beta2 + 
+      PDupwindNthSymm1beta2*Abs(beta1L) + PDupwindNthSymm2beta2*Abs(beta2L) + 
+      PDupwindNthSymm3beta2*Abs(beta3L));
+    
+    CCTK_REAL beta3rhsL = epsdiss1*PDdissipationNth1beta3 + 
+      epsdiss2*PDdissipationNth2beta3 + epsdiss3*PDdissipationNth3beta3 + 
+      ShiftGammaCoeff*theta*(beta3L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
+      ShiftBCoeff*(B3L - Xt3L) + Xt3L) + 
+      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta3 + 
+      beta2L*PDupwindNthAnti2beta3 + beta3L*PDupwindNthAnti3beta3 + 
+      PDupwindNthSymm1beta3*Abs(beta1L) + PDupwindNthSymm2beta3*Abs(beta2L) + 
+      PDupwindNthSymm3beta3*Abs(beta3L));
+    
+    CCTK_REAL B1rhsL = epsdiss1*PDdissipationNth1B1 + 
+      epsdiss2*PDdissipationNth2B1 + epsdiss3*PDdissipationNth3B1 + (dotXt1 - 
+      B1L*BetaDriver*eta)*ShiftBCoeff + 
+      ShiftAdvectionCoeff*(beta1L*(PDupwindNthAnti1B1 - PDupwindNthAnti1Xt1) 
+      + beta2L*(PDupwindNthAnti2B1 - PDupwindNthAnti2Xt1) + 
+      beta3L*(PDupwindNthAnti3B1 - PDupwindNthAnti3Xt1) + (PDupwindNthSymm1B1 
+      - PDupwindNthSymm1Xt1)*Abs(beta1L) + (PDupwindNthSymm2B1 - 
+      PDupwindNthSymm2Xt1)*Abs(beta2L) + (PDupwindNthSymm3B1 - 
+      PDupwindNthSymm3Xt1)*Abs(beta3L));
+    
+    CCTK_REAL B2rhsL = epsdiss1*PDdissipationNth1B2 + 
+      epsdiss2*PDdissipationNth2B2 + epsdiss3*PDdissipationNth3B2 + (dotXt2 - 
+      B2L*BetaDriver*eta)*ShiftBCoeff + 
+      ShiftAdvectionCoeff*(beta1L*(PDupwindNthAnti1B2 - PDupwindNthAnti1Xt2) 
+      + beta2L*(PDupwindNthAnti2B2 - PDupwindNthAnti2Xt2) + 
+      beta3L*(PDupwindNthAnti3B2 - PDupwindNthAnti3Xt2) + (PDupwindNthSymm1B2 
+      - PDupwindNthSymm1Xt2)*Abs(beta1L) + (PDupwindNthSymm2B2 - 
+      PDupwindNthSymm2Xt2)*Abs(beta2L) + (PDupwindNthSymm3B2 - 
+      PDupwindNthSymm3Xt2)*Abs(beta3L));
+    
+    CCTK_REAL B3rhsL = epsdiss1*PDdissipationNth1B3 + 
+      epsdiss2*PDdissipationNth2B3 + epsdiss3*PDdissipationNth3B3 + (dotXt3 - 
+      B3L*BetaDriver*eta)*ShiftBCoeff + 
+      ShiftAdvectionCoeff*(beta1L*(PDupwindNthAnti1B3 - PDupwindNthAnti1Xt3) 
+      + beta2L*(PDupwindNthAnti2B3 - PDupwindNthAnti2Xt3) + 
+      beta3L*(PDupwindNthAnti3B3 - PDupwindNthAnti3Xt3) + (PDupwindNthSymm1B3 
+      - PDupwindNthSymm1Xt3)*Abs(beta1L) + (PDupwindNthSymm2B3 - 
+      PDupwindNthSymm2Xt3)*Abs(beta2L) + (PDupwindNthSymm3B3 - 
+      PDupwindNthSymm3Xt3)*Abs(beta3L));
+    
+    
+    /* Copy local copies back to grid functions */
+    alpharhs[index] = alpharhsL;
+    Arhs[index] = ArhsL;
+    B1rhs[index] = B1rhsL;
+    B2rhs[index] = B2rhsL;
+    B3rhs[index] = B3rhsL;
+    beta1rhs[index] = beta1rhsL;
+    beta2rhs[index] = beta2rhsL;
+    beta3rhs[index] = beta3rhsL;
+    gt11rhs[index] = gt11rhsL;
+    gt12rhs[index] = gt12rhsL;
+    gt13rhs[index] = gt13rhsL;
+    gt22rhs[index] = gt22rhsL;
+    gt23rhs[index] = gt23rhsL;
+    gt33rhs[index] = gt33rhsL;
+    phirhs[index] = phirhsL;
+    trKrhs[index] = trKrhsL;
+    Xt1rhs[index] = Xt1rhsL;
+    Xt2rhs[index] = Xt2rhsL;
+    Xt3rhs[index] = Xt3rhsL;
+  }
+  LC_ENDLOOP3 (ML_BSSN_O8_RHS1);
+}
+
+void ML_BSSN_O8_RHS1(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_O8_RHS1_Body);
+}
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.cc b/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.cc
deleted file mode 100644
index 36c65d1..0000000
--- a/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.cc
+++ /dev/null
@@ -1,1037 +0,0 @@
-/*  File produced by Kranc */
-
-#define KRANC_C
-
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
-#include "GenericFD.h"
-#include "Differencing.h"
-#include "Vectors.hh"
-#include "loopcontrol.h"
-
-/* Define macros used in calculations */
-#define INITVALUE  (42)
-#define INV(x) ((1.0) / (x))
-#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
-#define QAD(x) ((x) * (x) * (x) * (x))
-
-static void ML_BSSN_O8_RHS1_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  
-  /* Declare finite differencing variables */
-  
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_O8_RHS1_Body");
-  }
-  
-  if (cctk_iteration % ML_BSSN_O8_RHS1_calc_every != ML_BSSN_O8_RHS1_calc_offset)
-  {
-    return;
-  }
-  
-  /* Include user-supplied include files */
-  
-  /* Initialise finite differencing variables */
-  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
-  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
-  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
-  int const di = 1;
-  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  CCTK_REAL const dxi = 1.0 / dx;
-  CCTK_REAL const dyi = 1.0 / dy;
-  CCTK_REAL const dzi = 1.0 / dz;
-  CCTK_REAL const khalf = 0.5;
-  CCTK_REAL const kthird = 1/3.0;
-  CCTK_REAL const ktwothird = 2.0/3.0;
-  CCTK_REAL const kfourthird = 4.0/3.0;
-  CCTK_REAL const keightthird = 8.0/3.0;
-  CCTK_REAL const hdxi = 0.5 * dxi;
-  CCTK_REAL const hdyi = 0.5 * dyi;
-  CCTK_REAL const hdzi = 0.5 * dzi;
-  
-  /* Initialize predefined quantities */
-  CCTK_REAL const p1o1024dx = INV(dx)/1024.;
-  CCTK_REAL const p1o1024dy = INV(dy)/1024.;
-  CCTK_REAL const p1o1024dz = INV(dz)/1024.;
-  CCTK_REAL const p1o1680dx = INV(dx)/1680.;
-  CCTK_REAL const p1o1680dy = INV(dy)/1680.;
-  CCTK_REAL const p1o1680dz = INV(dz)/1680.;
-  CCTK_REAL const p1o5040dx2 = pow(dx,-2)/5040.;
-  CCTK_REAL const p1o5040dy2 = pow(dy,-2)/5040.;
-  CCTK_REAL const p1o5040dz2 = pow(dz,-2)/5040.;
-  CCTK_REAL const p1o560dx = INV(dx)/560.;
-  CCTK_REAL const p1o560dy = INV(dy)/560.;
-  CCTK_REAL const p1o560dz = INV(dz)/560.;
-  CCTK_REAL const p1o705600dxdy = (INV(dx)*INV(dy))/705600.;
-  CCTK_REAL const p1o705600dxdz = (INV(dx)*INV(dz))/705600.;
-  CCTK_REAL const p1o705600dydz = (INV(dy)*INV(dz))/705600.;
-  CCTK_REAL const p1o840dx = INV(dx)/840.;
-  CCTK_REAL const p1o840dy = INV(dy)/840.;
-  CCTK_REAL const p1o840dz = INV(dz)/840.;
-  CCTK_REAL const p1odx = INV(dx);
-  CCTK_REAL const p1ody = INV(dy);
-  CCTK_REAL const p1odz = INV(dz);
-  CCTK_REAL const pm1o840dx = -INV(dx)/840.;
-  CCTK_REAL const pm1o840dy = -INV(dy)/840.;
-  CCTK_REAL const pm1o840dz = -INV(dz)/840.;
-  
-  /* Loop over the grid points */
-  #pragma omp parallel
-  LC_LOOP3 (ML_BSSN_O8_RHS1,
-            i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
-  {
-    // int index = INITVALUE;
-    int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    /* Declare derivatives */
-    // CCTK_REAL_VEC PDdissipationNth1A = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2A = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3A = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1A = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1A = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2A = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2A = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3A = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3A = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23alpha = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1B1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2B1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3B1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1B1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1B1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2B1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2B1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3B1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3B1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1B2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2B2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3B2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1B2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1B2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2B2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2B2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3B2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3B2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1B3 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2B3 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3B3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1B3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1B3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2B3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2B3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3B3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3B3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3phi = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1phi = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2phi = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3phi = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1phi = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1phi = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2phi = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2phi = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3phi = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1trK = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2trK = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3trK = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1trK = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2trK = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3trK = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1trK = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1trK = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2trK = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2trK = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3trK = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3trK = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3Xt3 = INITVALUE;
-    
-    /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  AL = vec_load(A[index]);
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  At11L = vec_load(At11[index]);
-    CCTK_REAL_VEC  At12L = vec_load(At12[index]);
-    CCTK_REAL_VEC  At13L = vec_load(At13[index]);
-    CCTK_REAL_VEC  At22L = vec_load(At22[index]);
-    CCTK_REAL_VEC  At23L = vec_load(At23[index]);
-    CCTK_REAL_VEC  At33L = vec_load(At33[index]);
-    CCTK_REAL_VEC  B1L = vec_load(B1[index]);
-    CCTK_REAL_VEC  B2L = vec_load(B2[index]);
-    CCTK_REAL_VEC  B3L = vec_load(B3[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  eTttL = (*stress_energy_state) ? vec_load(eTtt[index]) : 0.0;
-    CCTK_REAL_VEC  eTtxL = (*stress_energy_state) ? vec_load(eTtx[index]) : 0.0;
-    CCTK_REAL_VEC  eTtyL = (*stress_energy_state) ? vec_load(eTty[index]) : 0.0;
-    CCTK_REAL_VEC  eTtzL = (*stress_energy_state) ? vec_load(eTtz[index]) : 0.0;
-    CCTK_REAL_VEC  eTxxL = (*stress_energy_state) ? vec_load(eTxx[index]) : 0.0;
-    CCTK_REAL_VEC  eTxyL = (*stress_energy_state) ? vec_load(eTxy[index]) : 0.0;
-    CCTK_REAL_VEC  eTxzL = (*stress_energy_state) ? vec_load(eTxz[index]) : 0.0;
-    CCTK_REAL_VEC  eTyyL = (*stress_energy_state) ? vec_load(eTyy[index]) : 0.0;
-    CCTK_REAL_VEC  eTyzL = (*stress_energy_state) ? vec_load(eTyz[index]) : 0.0;
-    CCTK_REAL_VEC  eTzzL = (*stress_energy_state) ? vec_load(eTzz[index]) : 0.0;
-    CCTK_REAL_VEC  gt11L = vec_load(gt11[index]);
-    CCTK_REAL_VEC  gt12L = vec_load(gt12[index]);
-    CCTK_REAL_VEC  gt13L = vec_load(gt13[index]);
-    CCTK_REAL_VEC  gt22L = vec_load(gt22[index]);
-    CCTK_REAL_VEC  gt23L = vec_load(gt23[index]);
-    CCTK_REAL_VEC  gt33L = vec_load(gt33[index]);
-    CCTK_REAL_VEC  phiL = vec_load(phi[index]);
-    CCTK_REAL_VEC  rL = vec_load(r[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
-    CCTK_REAL_VEC  Xt1L = vec_load(Xt1[index]);
-    CCTK_REAL_VEC  Xt2L = vec_load(Xt2[index]);
-    CCTK_REAL_VEC  Xt3L = vec_load(Xt3[index]);
-    
-    /* Include user supplied include files */
-    
-    /* Precompute derivatives */
-    CCTK_REAL_VEC const PDdissipationNth1A = PDdissipationNth1(A, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2A = PDdissipationNth2(A, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3A = PDdissipationNth3(A, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1A = PDupwindNthAnti1(A, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1A = PDupwindNthSymm1(A, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2A = PDupwindNthAnti2(A, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2A = PDupwindNthSymm2(A, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3A = PDupwindNthAnti3(A, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3A = PDupwindNthSymm3(A, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1alpha = PDstandardNth1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2alpha = PDstandardNth2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3alpha = PDstandardNth3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11alpha = PDstandardNth11(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22alpha = PDstandardNth22(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33alpha = PDstandardNth33(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12alpha = PDstandardNth12(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13alpha = PDstandardNth13(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23alpha = PDstandardNth23(alpha, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1alpha = PDdissipationNth1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2alpha = PDdissipationNth2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3alpha = PDdissipationNth3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1alpha = PDupwindNthAnti1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1alpha = PDupwindNthSymm1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2alpha = PDupwindNthAnti2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2alpha = PDupwindNthSymm2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3alpha = PDupwindNthAnti3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3alpha = PDupwindNthSymm3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1B1 = PDdissipationNth1(B1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2B1 = PDdissipationNth2(B1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3B1 = PDdissipationNth3(B1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1B1 = PDupwindNthAnti1(B1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1B1 = PDupwindNthSymm1(B1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2B1 = PDupwindNthAnti2(B1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2B1 = PDupwindNthSymm2(B1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3B1 = PDupwindNthAnti3(B1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3B1 = PDupwindNthSymm3(B1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1B2 = PDdissipationNth1(B2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2B2 = PDdissipationNth2(B2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3B2 = PDdissipationNth3(B2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1B2 = PDupwindNthAnti1(B2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1B2 = PDupwindNthSymm1(B2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2B2 = PDupwindNthAnti2(B2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2B2 = PDupwindNthSymm2(B2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3B2 = PDupwindNthAnti3(B2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3B2 = PDupwindNthSymm3(B2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1B3 = PDdissipationNth1(B3, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2B3 = PDdissipationNth2(B3, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3B3 = PDdissipationNth3(B3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1B3 = PDupwindNthAnti1(B3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1B3 = PDupwindNthSymm1(B3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2B3 = PDupwindNthAnti2(B3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2B3 = PDupwindNthSymm2(B3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3B3 = PDupwindNthAnti3(B3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3B3 = PDupwindNthSymm3(B3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1beta1 = PDstandardNth1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2beta1 = PDstandardNth2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3beta1 = PDstandardNth3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11beta1 = PDstandardNth11(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22beta1 = PDstandardNth22(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33beta1 = PDstandardNth33(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12beta1 = PDstandardNth12(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13beta1 = PDstandardNth13(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23beta1 = PDstandardNth23(beta1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1beta1 = PDdissipationNth1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2beta1 = PDdissipationNth2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3beta1 = PDdissipationNth3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta1 = PDupwindNthAnti1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta1 = PDupwindNthSymm1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta1 = PDupwindNthAnti2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta1 = PDupwindNthSymm2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta1 = PDupwindNthAnti3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta1 = PDupwindNthSymm3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1beta2 = PDstandardNth1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2beta2 = PDstandardNth2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3beta2 = PDstandardNth3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11beta2 = PDstandardNth11(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22beta2 = PDstandardNth22(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33beta2 = PDstandardNth33(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12beta2 = PDstandardNth12(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13beta2 = PDstandardNth13(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23beta2 = PDstandardNth23(beta2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1beta2 = PDdissipationNth1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2beta2 = PDdissipationNth2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3beta2 = PDdissipationNth3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta2 = PDupwindNthAnti1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta2 = PDupwindNthSymm1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta2 = PDupwindNthAnti2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta2 = PDupwindNthSymm2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta2 = PDupwindNthAnti3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta2 = PDupwindNthSymm3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1beta3 = PDstandardNth1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2beta3 = PDstandardNth2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3beta3 = PDstandardNth3(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11beta3 = PDstandardNth11(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22beta3 = PDstandardNth22(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33beta3 = PDstandardNth33(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12beta3 = PDstandardNth12(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13beta3 = PDstandardNth13(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23beta3 = PDstandardNth23(beta3, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1beta3 = PDdissipationNth1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2beta3 = PDdissipationNth2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3beta3 = PDdissipationNth3(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta3 = PDupwindNthAnti1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta3 = PDupwindNthSymm1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta3 = PDupwindNthAnti2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta3 = PDupwindNthSymm2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta3 = PDupwindNthAnti3(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta3 = PDupwindNthSymm3(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1gt11 = PDdissipationNth1(gt11, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2gt11 = PDdissipationNth2(gt11, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3gt11 = PDdissipationNth3(gt11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1gt11 = PDupwindNthAnti1(gt11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1gt11 = PDupwindNthSymm1(gt11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2gt11 = PDupwindNthAnti2(gt11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2gt11 = PDupwindNthSymm2(gt11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3gt11 = PDupwindNthAnti3(gt11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3gt11 = PDupwindNthSymm3(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt12 = PDstandardNth1(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt12 = PDstandardNth2(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt12 = PDstandardNth3(gt12, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1gt12 = PDdissipationNth1(gt12, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2gt12 = PDdissipationNth2(gt12, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3gt12 = PDdissipationNth3(gt12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1gt12 = PDupwindNthAnti1(gt12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1gt12 = PDupwindNthSymm1(gt12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2gt12 = PDupwindNthAnti2(gt12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2gt12 = PDupwindNthSymm2(gt12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3gt12 = PDupwindNthAnti3(gt12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3gt12 = PDupwindNthSymm3(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt13 = PDstandardNth1(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt13 = PDstandardNth2(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt13 = PDstandardNth3(gt13, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1gt13 = PDdissipationNth1(gt13, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2gt13 = PDdissipationNth2(gt13, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3gt13 = PDdissipationNth3(gt13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1gt13 = PDupwindNthAnti1(gt13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1gt13 = PDupwindNthSymm1(gt13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2gt13 = PDupwindNthAnti2(gt13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2gt13 = PDupwindNthSymm2(gt13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3gt13 = PDupwindNthAnti3(gt13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3gt13 = PDupwindNthSymm3(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt22 = PDstandardNth1(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt22 = PDstandardNth2(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt22 = PDstandardNth3(gt22, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1gt22 = PDdissipationNth1(gt22, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2gt22 = PDdissipationNth2(gt22, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3gt22 = PDdissipationNth3(gt22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1gt22 = PDupwindNthAnti1(gt22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1gt22 = PDupwindNthSymm1(gt22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2gt22 = PDupwindNthAnti2(gt22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2gt22 = PDupwindNthSymm2(gt22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3gt22 = PDupwindNthAnti3(gt22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3gt22 = PDupwindNthSymm3(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt23 = PDstandardNth1(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt23 = PDstandardNth2(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt23 = PDstandardNth3(gt23, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1gt23 = PDdissipationNth1(gt23, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2gt23 = PDdissipationNth2(gt23, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3gt23 = PDdissipationNth3(gt23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1gt23 = PDupwindNthAnti1(gt23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1gt23 = PDupwindNthSymm1(gt23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2gt23 = PDupwindNthAnti2(gt23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2gt23 = PDupwindNthSymm2(gt23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3gt23 = PDupwindNthAnti3(gt23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3gt23 = PDupwindNthSymm3(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt33 = PDstandardNth1(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1gt33 = PDdissipationNth1(gt33, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2gt33 = PDdissipationNth2(gt33, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3gt33 = PDdissipationNth3(gt33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1gt33 = PDupwindNthAnti1(gt33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1gt33 = PDupwindNthSymm1(gt33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2gt33 = PDupwindNthAnti2(gt33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2gt33 = PDupwindNthSymm2(gt33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3gt33 = PDupwindNthAnti3(gt33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3gt33 = PDupwindNthSymm3(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1phi = PDstandardNth1(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2phi = PDstandardNth2(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3phi = PDstandardNth3(phi, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1phi = PDdissipationNth1(phi, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2phi = PDdissipationNth2(phi, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3phi = PDdissipationNth3(phi, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1phi = PDupwindNthAnti1(phi, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1phi = PDupwindNthSymm1(phi, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2phi = PDupwindNthAnti2(phi, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2phi = PDupwindNthSymm2(phi, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3phi = PDupwindNthAnti3(phi, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3phi = PDupwindNthSymm3(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1trK = PDstandardNth1(trK, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2trK = PDstandardNth2(trK, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3trK = PDstandardNth3(trK, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1trK = PDdissipationNth1(trK, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2trK = PDdissipationNth2(trK, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3trK = PDdissipationNth3(trK, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1trK = PDupwindNthAnti1(trK, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1trK = PDupwindNthSymm1(trK, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2trK = PDupwindNthAnti2(trK, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2trK = PDupwindNthSymm2(trK, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3trK = PDupwindNthAnti3(trK, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3trK = PDupwindNthSymm3(trK, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1Xt1 = PDdissipationNth1(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2Xt1 = PDdissipationNth2(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3Xt1 = PDdissipationNth3(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1Xt1 = PDupwindNthAnti1(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1Xt1 = PDupwindNthSymm1(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2Xt1 = PDupwindNthAnti2(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2Xt1 = PDupwindNthSymm2(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3Xt1 = PDupwindNthAnti3(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3Xt1 = PDupwindNthSymm3(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1Xt2 = PDdissipationNth1(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2Xt2 = PDdissipationNth2(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3Xt2 = PDdissipationNth3(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1Xt2 = PDupwindNthAnti1(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1Xt2 = PDupwindNthSymm1(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2Xt2 = PDupwindNthAnti2(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2Xt2 = PDupwindNthSymm2(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3Xt2 = PDupwindNthAnti3(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3Xt2 = PDupwindNthSymm3(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1Xt3 = PDdissipationNth1(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2Xt3 = PDdissipationNth2(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3Xt3 = PDdissipationNth3(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1Xt3 = PDupwindNthAnti1(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1Xt3 = PDupwindNthSymm1(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2Xt3 = PDupwindNthAnti2(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2Xt3 = PDupwindNthSymm2(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3Xt3 = PDupwindNthAnti3(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3Xt3 = PDupwindNthSymm3(Xt3, i, j, k);
-    
-    /* Calculate temporaries and grid functions */
-    int dir1 = Sign(beta1L);
-    
-    int dir2 = Sign(beta2L);
-    
-    int dir3 = Sign(beta3L);
-    
-    CCTK_REAL_VEC epsdiss1 = EpsDiss;
-    
-    CCTK_REAL_VEC epsdiss2 = EpsDiss;
-    
-    CCTK_REAL_VEC epsdiss3 = EpsDiss;
-    
-    CCTK_REAL_VEC detgt = 1;
-    
-    CCTK_REAL_VEC gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
-    
-    CCTK_REAL_VEC gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
-    
-    CCTK_REAL_VEC gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
-    
-    CCTK_REAL_VEC gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
-    
-    CCTK_REAL_VEC gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
-    
-    CCTK_REAL_VEC gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
-    
-    CCTK_REAL_VEC Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
-      2*(gtu21*PDstandardNth1gt12 + gtu31*PDstandardNth1gt13) - 
-      gtu21*PDstandardNth2gt11 - gtu31*PDstandardNth3gt11);
-    
-    CCTK_REAL_VEC Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
-      2*(gtu22*PDstandardNth1gt12 + gtu32*PDstandardNth1gt13) - 
-      gtu22*PDstandardNth2gt11 - gtu32*PDstandardNth3gt11);
-    
-    CCTK_REAL_VEC Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
-      2*(gtu32*PDstandardNth1gt12 + gtu33*PDstandardNth1gt13) - 
-      gtu32*PDstandardNth2gt11 - gtu33*PDstandardNth3gt11);
-    
-    CCTK_REAL_VEC Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
-      gtu11*PDstandardNth2gt11 + gtu31*(PDstandardNth1gt23 + 
-      PDstandardNth2gt13 - PDstandardNth3gt12));
-    
-    CCTK_REAL_VEC Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
-      gtu21*PDstandardNth2gt11 + gtu32*(PDstandardNth1gt23 + 
-      PDstandardNth2gt13 - PDstandardNth3gt12));
-    
-    CCTK_REAL_VEC Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
-      gtu31*PDstandardNth2gt11 + gtu33*(PDstandardNth1gt23 + 
-      PDstandardNth2gt13 - PDstandardNth3gt12));
-    
-    CCTK_REAL_VEC Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
-      gtu11*PDstandardNth3gt11 + gtu21*(PDstandardNth1gt23 - 
-      PDstandardNth2gt13 + PDstandardNth3gt12));
-    
-    CCTK_REAL_VEC Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
-      gtu21*PDstandardNth3gt11 + gtu22*(PDstandardNth1gt23 - 
-      PDstandardNth2gt13 + PDstandardNth3gt12));
-    
-    CCTK_REAL_VEC Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
-      gtu31*PDstandardNth3gt11 + gtu32*(PDstandardNth1gt23 - 
-      PDstandardNth2gt13 + PDstandardNth3gt12));
-    
-    CCTK_REAL_VEC Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
-      2*PDstandardNth2gt12) + gtu21*PDstandardNth2gt22 + 
-      gtu31*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
-    
-    CCTK_REAL_VEC Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
-      2*PDstandardNth2gt12) + gtu22*PDstandardNth2gt22 + 
-      gtu32*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
-    
-    CCTK_REAL_VEC Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
-      2*PDstandardNth2gt12) + gtu32*PDstandardNth2gt22 + 
-      gtu33*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
-    
-    CCTK_REAL_VEC Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
-      gtu11*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
-      gtu21*PDstandardNth3gt22);
-    
-    CCTK_REAL_VEC Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
-      gtu21*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
-      gtu22*PDstandardNth3gt22);
-    
-    CCTK_REAL_VEC Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
-      gtu31*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
-      gtu32*PDstandardNth3gt22);
-    
-    CCTK_REAL_VEC Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
-      gtu21*PDstandardNth2gt33 + 2*gtu11*PDstandardNth3gt13 + 
-      2*gtu21*PDstandardNth3gt23 + gtu31*PDstandardNth3gt33);
-    
-    CCTK_REAL_VEC Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
-      gtu22*PDstandardNth2gt33 + 2*gtu21*PDstandardNth3gt13 + 
-      2*gtu22*PDstandardNth3gt23 + gtu32*PDstandardNth3gt33);
-    
-    CCTK_REAL_VEC Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
-      gtu32*PDstandardNth2gt33 + 2*gtu31*PDstandardNth3gt13 + 
-      2*gtu32*PDstandardNth3gt23 + gtu33*PDstandardNth3gt33);
-    
-    CCTK_REAL_VEC Xtn1 = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
-      Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33;
-    
-    CCTK_REAL_VEC Xtn2 = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
-      Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33;
-    
-    CCTK_REAL_VEC Xtn3 = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
-      Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
-    
-    CCTK_REAL_VEC fac1 = IfThen(conformalMethod,-(khalf*INV(phiL)),1);
-    
-    CCTK_REAL_VEC cdphi1 = fac1*PDstandardNth1phi;
-    
-    CCTK_REAL_VEC cdphi2 = fac1*PDstandardNth2phi;
-    
-    CCTK_REAL_VEC cdphi3 = fac1*PDstandardNth3phi;
-    
-    CCTK_REAL_VEC Atm11 = At11L*gtu11 + At12L*gtu21 + At13L*gtu31;
-    
-    CCTK_REAL_VEC Atm21 = At11L*gtu21 + At12L*gtu22 + At13L*gtu32;
-    
-    CCTK_REAL_VEC Atm31 = At11L*gtu31 + At12L*gtu32 + At13L*gtu33;
-    
-    CCTK_REAL_VEC Atm12 = At12L*gtu11 + At22L*gtu21 + At23L*gtu31;
-    
-    CCTK_REAL_VEC Atm22 = At12L*gtu21 + At22L*gtu22 + At23L*gtu32;
-    
-    CCTK_REAL_VEC Atm32 = At12L*gtu31 + At22L*gtu32 + At23L*gtu33;
-    
-    CCTK_REAL_VEC Atm13 = At13L*gtu11 + At23L*gtu21 + At33L*gtu31;
-    
-    CCTK_REAL_VEC Atm23 = At13L*gtu21 + At23L*gtu22 + At33L*gtu32;
-    
-    CCTK_REAL_VEC Atm33 = At13L*gtu31 + At23L*gtu32 + At33L*gtu33;
-    
-    CCTK_REAL_VEC Atu11 = Atm11*gtu11 + Atm12*gtu21 + Atm13*gtu31;
-    
-    CCTK_REAL_VEC Atu21 = Atm11*gtu21 + Atm12*gtu22 + Atm13*gtu32;
-    
-    CCTK_REAL_VEC Atu31 = Atm11*gtu31 + Atm12*gtu32 + Atm13*gtu33;
-    
-    CCTK_REAL_VEC Atu22 = Atm21*gtu21 + Atm22*gtu22 + Atm23*gtu32;
-    
-    CCTK_REAL_VEC Atu32 = Atm21*gtu31 + Atm22*gtu32 + Atm23*gtu33;
-    
-    CCTK_REAL_VEC Atu33 = Atm31*gtu31 + Atm32*gtu32 + Atm33*gtu33;
-    
-    CCTK_REAL_VEC e4phi = 
-      IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
-    
-    CCTK_REAL_VEC em4phi = INV(e4phi);
-    
-    CCTK_REAL_VEC rho = pow(alphaL,-2)*(eTttL - 2*(beta2L*eTtyL + 
-      beta3L*eTtzL) + 2*(beta1L*(-eTtxL + beta2L*eTxyL + beta3L*eTxzL) + 
-      beta2L*beta3L*eTyzL) + eTxxL*SQR(beta1L) + eTyyL*SQR(beta2L) + 
-      eTzzL*SQR(beta3L));
-    
-    CCTK_REAL_VEC S1 = (-eTtxL + beta1L*eTxxL + beta2L*eTxyL + 
-      beta3L*eTxzL)*INV(alphaL);
-    
-    CCTK_REAL_VEC S2 = (-eTtyL + beta1L*eTxyL + beta2L*eTyyL + 
-      beta3L*eTyzL)*INV(alphaL);
-    
-    CCTK_REAL_VEC S3 = (-eTtzL + beta1L*eTxzL + beta2L*eTyzL + 
-      beta3L*eTzzL)*INV(alphaL);
-    
-    CCTK_REAL_VEC trS = em4phi*(eTxxL*gtu11 + eTyyL*gtu22 + 2*(eTxyL*gtu21 
-      + eTxzL*gtu31 + eTyzL*gtu32) + eTzzL*gtu33);
-    
-    CCTK_REAL_VEC phirhsL = epsdiss1*PDdissipationNth1phi + 
-      epsdiss2*PDdissipationNth2phi + epsdiss3*PDdissipationNth3phi + 
-      beta1L*PDupwindNthAnti1phi + beta2L*PDupwindNthAnti2phi + 
-      beta3L*PDupwindNthAnti3phi + PDupwindNthSymm1phi*Abs(beta1L) + 
-      PDupwindNthSymm2phi*Abs(beta2L) + PDupwindNthSymm3phi*Abs(beta3L) + 
-      (PDstandardNth1beta1 + PDstandardNth2beta2 + 
-      PDstandardNth3beta3)*IfThen(conformalMethod,-(kthird*phiL),0.16666666666666666) 
-      + alphaL*trKL*IfThen(conformalMethod,kthird*phiL,-0.16666666666666666);
-    
-    CCTK_REAL_VEC gt11rhsL = -2*alphaL*At11L + 
-      epsdiss1*PDdissipationNth1gt11 + epsdiss2*PDdissipationNth2gt11 + 
-      epsdiss3*PDdissipationNth3gt11 + 2*(gt12L*PDstandardNth1beta2 + 
-      gt13L*PDstandardNth1beta3) + gt11L*(kfourthird*PDstandardNth1beta1 - 
-      ktwothird*PDstandardNth2beta2 - ktwothird*PDstandardNth3beta3) + 
-      beta1L*PDupwindNthAnti1gt11 + beta2L*PDupwindNthAnti2gt11 + 
-      beta3L*PDupwindNthAnti3gt11 + PDupwindNthSymm1gt11*Abs(beta1L) + 
-      PDupwindNthSymm2gt11*Abs(beta2L) + PDupwindNthSymm3gt11*Abs(beta3L);
-    
-    CCTK_REAL_VEC gt12rhsL = -2*alphaL*At12L + 
-      epsdiss1*PDdissipationNth1gt12 + epsdiss2*PDdissipationNth2gt12 + 
-      epsdiss3*PDdissipationNth3gt12 + gt22L*PDstandardNth1beta2 + 
-      gt23L*PDstandardNth1beta3 + gt11L*PDstandardNth2beta1 + 
-      gt13L*PDstandardNth2beta3 + gt12L*(kthird*(PDstandardNth1beta1 + 
-      PDstandardNth2beta2) - ktwothird*PDstandardNth3beta3) + 
-      beta1L*PDupwindNthAnti1gt12 + beta2L*PDupwindNthAnti2gt12 + 
-      beta3L*PDupwindNthAnti3gt12 + PDupwindNthSymm1gt12*Abs(beta1L) + 
-      PDupwindNthSymm2gt12*Abs(beta2L) + PDupwindNthSymm3gt12*Abs(beta3L);
-    
-    CCTK_REAL_VEC gt13rhsL = -2*alphaL*At13L + 
-      epsdiss1*PDdissipationNth1gt13 + epsdiss2*PDdissipationNth2gt13 + 
-      epsdiss3*PDdissipationNth3gt13 + gt23L*PDstandardNth1beta2 + 
-      gt33L*PDstandardNth1beta3 + gt11L*PDstandardNth3beta1 + 
-      gt12L*PDstandardNth3beta2 + gt13L*(-(ktwothird*PDstandardNth2beta2) + 
-      kthird*(PDstandardNth1beta1 + PDstandardNth3beta3)) + 
-      beta1L*PDupwindNthAnti1gt13 + beta2L*PDupwindNthAnti2gt13 + 
-      beta3L*PDupwindNthAnti3gt13 + PDupwindNthSymm1gt13*Abs(beta1L) + 
-      PDupwindNthSymm2gt13*Abs(beta2L) + PDupwindNthSymm3gt13*Abs(beta3L);
-    
-    CCTK_REAL_VEC gt22rhsL = -2*alphaL*At22L + 
-      epsdiss1*PDdissipationNth1gt22 + epsdiss2*PDdissipationNth2gt22 + 
-      epsdiss3*PDdissipationNth3gt22 + 2*(gt12L*PDstandardNth2beta1 + 
-      gt23L*PDstandardNth2beta3) + gt22L*(-(ktwothird*PDstandardNth1beta1) + 
-      kfourthird*PDstandardNth2beta2 - ktwothird*PDstandardNth3beta3) + 
-      beta1L*PDupwindNthAnti1gt22 + beta2L*PDupwindNthAnti2gt22 + 
-      beta3L*PDupwindNthAnti3gt22 + PDupwindNthSymm1gt22*Abs(beta1L) + 
-      PDupwindNthSymm2gt22*Abs(beta2L) + PDupwindNthSymm3gt22*Abs(beta3L);
-    
-    CCTK_REAL_VEC gt23rhsL = -2*alphaL*At23L + 
-      epsdiss1*PDdissipationNth1gt23 + epsdiss2*PDdissipationNth2gt23 + 
-      epsdiss3*PDdissipationNth3gt23 + gt13L*PDstandardNth2beta1 + 
-      gt33L*PDstandardNth2beta3 + gt12L*PDstandardNth3beta1 + 
-      gt22L*PDstandardNth3beta2 + gt23L*(-(ktwothird*PDstandardNth1beta1) + 
-      kthird*(PDstandardNth2beta2 + PDstandardNth3beta3)) + 
-      beta1L*PDupwindNthAnti1gt23 + beta2L*PDupwindNthAnti2gt23 + 
-      beta3L*PDupwindNthAnti3gt23 + PDupwindNthSymm1gt23*Abs(beta1L) + 
-      PDupwindNthSymm2gt23*Abs(beta2L) + PDupwindNthSymm3gt23*Abs(beta3L);
-    
-    CCTK_REAL_VEC gt33rhsL = -2*alphaL*At33L + 
-      epsdiss1*PDdissipationNth1gt33 + epsdiss2*PDdissipationNth2gt33 + 
-      epsdiss3*PDdissipationNth3gt33 - gt33L*ktwothird*PDstandardNth1beta1 - 
-      gt33L*ktwothird*PDstandardNth2beta2 + 2*gt13L*PDstandardNth3beta1 + 
-      2*gt23L*PDstandardNth3beta2 + gt33L*kfourthird*PDstandardNth3beta3 + 
-      beta1L*PDupwindNthAnti1gt33 + beta2L*PDupwindNthAnti2gt33 + 
-      beta3L*PDupwindNthAnti3gt33 + PDupwindNthSymm1gt33*Abs(beta1L) + 
-      PDupwindNthSymm2gt33*Abs(beta2L) + PDupwindNthSymm3gt33*Abs(beta3L);
-    
-    CCTK_REAL_VEC dotXt1 = kthird*(7*(gtu21*PDstandardNth12beta1 + 
-      gtu31*PDstandardNth13beta1) + gtu11*(4*PDstandardNth11beta1 + 
-      PDstandardNth12beta2 + PDstandardNth13beta3) + 
-      gtu21*(PDstandardNth22beta2 + PDstandardNth23beta3) + 
-      gtu31*(PDstandardNth23beta2 + PDstandardNth33beta3) - 
-      6*(Atu11*PDstandardNth1alpha + Atu21*PDstandardNth2alpha + 
-      Atu31*PDstandardNth3alpha) + 6*(gtu32*PDstandardNth23beta1 + 
-      alphaL*(6*(Atu11*cdphi1 + Atu21*cdphi2 + Atu31*cdphi3) + Atu11*Gt111 + 
-      Atu22*Gt122 + 2*(Atu21*Gt112 + Atu31*Gt113 + Atu32*Gt123) + Atu33*Gt133 
-      - ktwothird*(gtu11*PDstandardNth1trK + gtu21*PDstandardNth2trK + 
-      gtu31*PDstandardNth3trK))) - 
-      150.7964473723100754462068823974161384415*alphaL*(gtu11*S1 + gtu21*S2 + 
-      gtu31*S3) + (-3*PDstandardNth1beta1 + 2*(PDstandardNth1beta1 + 
-      PDstandardNth2beta2 + PDstandardNth3beta3))*Xtn1 - 
-      3*(PDstandardNth2beta1*Xtn2 + PDstandardNth3beta1*Xtn3) + 
-      3*(epsdiss1*PDdissipationNth1Xt1 + epsdiss2*PDdissipationNth2Xt1 + 
-      epsdiss3*PDdissipationNth3Xt1 + gtu22*PDstandardNth22beta1 + 
-      gtu33*PDstandardNth33beta1 + beta1L*PDupwindNthAnti1Xt1 + 
-      beta2L*PDupwindNthAnti2Xt1 + beta3L*PDupwindNthAnti3Xt1 + 
-      PDupwindNthSymm1Xt1*Abs(beta1L) + PDupwindNthSymm2Xt1*Abs(beta2L) + 
-      PDupwindNthSymm3Xt1*Abs(beta3L)));
-    
-    CCTK_REAL_VEC dotXt2 = kthird*(gtu21*(PDstandardNth11beta1 + 
-      7*PDstandardNth12beta2 + PDstandardNth13beta3) + 
-      gtu22*(PDstandardNth12beta1 + 4*PDstandardNth22beta2 + 
-      PDstandardNth23beta3) + gtu32*(PDstandardNth13beta1 + 
-      7*PDstandardNth23beta2 + PDstandardNth33beta3) - 
-      6*(Atu21*PDstandardNth1alpha + Atu22*PDstandardNth2alpha + 
-      Atu32*PDstandardNth3alpha) + 6*(gtu31*PDstandardNth13beta2 + 
-      alphaL*(6*(Atu21*cdphi1 + Atu22*cdphi2 + Atu32*cdphi3) + Atu11*Gt211 + 
-      Atu22*Gt222 + 2*(Atu21*Gt212 + Atu31*Gt213 + Atu32*Gt223) + Atu33*Gt233 
-      - ktwothird*(gtu21*PDstandardNth1trK + gtu22*PDstandardNth2trK + 
-      gtu32*PDstandardNth3trK))) - 
-      150.7964473723100754462068823974161384415*alphaL*(gtu21*S1 + gtu22*S2 + 
-      gtu32*S3) + 2*(PDstandardNth1beta1 + PDstandardNth2beta2 + 
-      PDstandardNth3beta3)*Xtn2 - 3*(PDstandardNth1beta2*Xtn1 + 
-      PDstandardNth2beta2*Xtn2 + PDstandardNth3beta2*Xtn3) + 
-      3*(epsdiss1*PDdissipationNth1Xt2 + epsdiss2*PDdissipationNth2Xt2 + 
-      epsdiss3*PDdissipationNth3Xt2 + gtu11*PDstandardNth11beta2 + 
-      gtu33*PDstandardNth33beta2 + beta1L*PDupwindNthAnti1Xt2 + 
-      beta2L*PDupwindNthAnti2Xt2 + beta3L*PDupwindNthAnti3Xt2 + 
-      PDupwindNthSymm1Xt2*Abs(beta1L) + PDupwindNthSymm2Xt2*Abs(beta2L) + 
-      PDupwindNthSymm3Xt2*Abs(beta3L)));
-    
-    CCTK_REAL_VEC dotXt3 = kthird*(gtu31*(PDstandardNth11beta1 + 
-      PDstandardNth12beta2 + 7*PDstandardNth13beta3) + 
-      gtu32*(PDstandardNth12beta1 + PDstandardNth22beta2 + 
-      7*PDstandardNth23beta3) + gtu33*(PDstandardNth13beta1 + 
-      PDstandardNth23beta2 + 4*PDstandardNth33beta3) - 
-      6*(Atu31*PDstandardNth1alpha + Atu32*PDstandardNth2alpha + 
-      Atu33*PDstandardNth3alpha) + 6*(gtu21*PDstandardNth12beta3 + 
-      alphaL*(6*(Atu31*cdphi1 + Atu32*cdphi2 + Atu33*cdphi3) + Atu11*Gt311 + 
-      Atu22*Gt322 + 2*(Atu21*Gt312 + Atu31*Gt313 + Atu32*Gt323) + Atu33*Gt333 
-      - ktwothird*(gtu31*PDstandardNth1trK + gtu32*PDstandardNth2trK + 
-      gtu33*PDstandardNth3trK))) - 
-      150.7964473723100754462068823974161384415*alphaL*(gtu31*S1 + gtu32*S2 + 
-      gtu33*S3) + 2*(PDstandardNth1beta1 + PDstandardNth2beta2 + 
-      PDstandardNth3beta3)*Xtn3 - 3*(PDstandardNth1beta3*Xtn1 + 
-      PDstandardNth2beta3*Xtn2 + PDstandardNth3beta3*Xtn3) + 
-      3*(epsdiss1*PDdissipationNth1Xt3 + epsdiss2*PDdissipationNth2Xt3 + 
-      epsdiss3*PDdissipationNth3Xt3 + gtu11*PDstandardNth11beta3 + 
-      gtu22*PDstandardNth22beta3 + beta1L*PDupwindNthAnti1Xt3 + 
-      beta2L*PDupwindNthAnti2Xt3 + beta3L*PDupwindNthAnti3Xt3 + 
-      PDupwindNthSymm1Xt3*Abs(beta1L) + PDupwindNthSymm2Xt3*Abs(beta2L) + 
-      PDupwindNthSymm3Xt3*Abs(beta3L)));
-    
-    CCTK_REAL_VEC Xt1rhsL = dotXt1;
-    
-    CCTK_REAL_VEC Xt2rhsL = dotXt2;
-    
-    CCTK_REAL_VEC Xt3rhsL = dotXt3;
-    
-    CCTK_REAL_VEC dottrK = epsdiss1*PDdissipationNth1trK + 
-      epsdiss2*PDdissipationNth2trK + epsdiss3*PDdissipationNth3trK + 
-      beta1L*PDupwindNthAnti1trK + beta2L*PDupwindNthAnti2trK + 
-      beta3L*PDupwindNthAnti3trK - em4phi*(gtu11*PDstandardNth11alpha + 
-      gtu22*PDstandardNth22alpha + gtu33*(PDstandardNth33alpha + 
-      2*cdphi3*PDstandardNth3alpha) + 2*(gtu21*PDstandardNth12alpha + 
-      gtu31*(PDstandardNth13alpha + cdphi1*PDstandardNth3alpha) + 
-      gtu32*(PDstandardNth23alpha + cdphi2*PDstandardNth3alpha)) + 
-      PDstandardNth1alpha*(2*(cdphi1*gtu11 + cdphi2*gtu21 + cdphi3*gtu31) - 
-      Xtn1) + PDstandardNth2alpha*(2*(cdphi1*gtu21 + cdphi2*gtu22 + 
-      cdphi3*gtu32) - Xtn2) - PDstandardNth3alpha*Xtn3) + 
-      PDupwindNthSymm1trK*Abs(beta1L) + PDupwindNthSymm2trK*Abs(beta2L) + 
-      PDupwindNthSymm3trK*Abs(beta3L) + alphaL*(2*(Atm12*Atm21 + Atm13*Atm31 
-      + Atm23*Atm32) + 12.56637061435917295385057353311801153679*(rho + trS) 
-      + SQR(Atm11) + SQR(Atm22) + SQR(Atm33) + kthird*SQR(trKL));
-    
-    CCTK_REAL_VEC trKrhsL = dottrK;
-    
-    CCTK_REAL_VEC alpharhsL = epsdiss1*PDdissipationNth1alpha + 
-      epsdiss2*PDdissipationNth2alpha + epsdiss3*PDdissipationNth3alpha + 
-      LapseAdvectionCoeff*(beta1L*PDupwindNthAnti1alpha + 
-      beta2L*PDupwindNthAnti2alpha + beta3L*PDupwindNthAnti3alpha + 
-      PDupwindNthSymm1alpha*Abs(beta1L) + PDupwindNthSymm2alpha*Abs(beta2L) + 
-      PDupwindNthSymm3alpha*Abs(beta3L)) - harmonicF*(LapseACoeff*(AL - trKL) 
-      + trKL)*pow(alphaL,harmonicN);
-    
-    CCTK_REAL_VEC ArhsL = (-(AL*AlphaDriver) + dottrK)*LapseACoeff + 
-      epsdiss1*PDdissipationNth1A + epsdiss2*PDdissipationNth2A + 
-      epsdiss3*PDdissipationNth3A + 
-      LapseAdvectionCoeff*(beta1L*PDupwindNthAnti1A + 
-      beta2L*PDupwindNthAnti2A + beta3L*PDupwindNthAnti3A + 
-      PDupwindNthSymm1A*Abs(beta1L) + PDupwindNthSymm2A*Abs(beta2L) + 
-      PDupwindNthSymm3A*Abs(beta3L));
-    
-    CCTK_REAL_VEC eta = fmin(1,SpatialBetaDriverRadius*INV(rL));
-    
-    CCTK_REAL_VEC theta = fmin(1,exp(1 - 
-      rL*INV(SpatialShiftGammaCoeffRadius)));
-    
-    CCTK_REAL_VEC beta1rhsL = epsdiss1*PDdissipationNth1beta1 + 
-      epsdiss2*PDdissipationNth2beta1 + epsdiss3*PDdissipationNth3beta1 + 
-      ShiftGammaCoeff*theta*(beta1L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B1L - Xt1L) + Xt1L) + 
-      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta1 + 
-      beta2L*PDupwindNthAnti2beta1 + beta3L*PDupwindNthAnti3beta1 + 
-      PDupwindNthSymm1beta1*Abs(beta1L) + PDupwindNthSymm2beta1*Abs(beta2L) + 
-      PDupwindNthSymm3beta1*Abs(beta3L));
-    
-    CCTK_REAL_VEC beta2rhsL = epsdiss1*PDdissipationNth1beta2 + 
-      epsdiss2*PDdissipationNth2beta2 + epsdiss3*PDdissipationNth3beta2 + 
-      ShiftGammaCoeff*theta*(beta2L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B2L - Xt2L) + Xt2L) + 
-      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta2 + 
-      beta2L*PDupwindNthAnti2beta2 + beta3L*PDupwindNthAnti3beta2 + 
-      PDupwindNthSymm1beta2*Abs(beta1L) + PDupwindNthSymm2beta2*Abs(beta2L) + 
-      PDupwindNthSymm3beta2*Abs(beta3L));
-    
-    CCTK_REAL_VEC beta3rhsL = epsdiss1*PDdissipationNth1beta3 + 
-      epsdiss2*PDdissipationNth2beta3 + epsdiss3*PDdissipationNth3beta3 + 
-      ShiftGammaCoeff*theta*(beta3L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B3L - Xt3L) + Xt3L) + 
-      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta3 + 
-      beta2L*PDupwindNthAnti2beta3 + beta3L*PDupwindNthAnti3beta3 + 
-      PDupwindNthSymm1beta3*Abs(beta1L) + PDupwindNthSymm2beta3*Abs(beta2L) + 
-      PDupwindNthSymm3beta3*Abs(beta3L));
-    
-    CCTK_REAL_VEC B1rhsL = epsdiss1*PDdissipationNth1B1 + 
-      epsdiss2*PDdissipationNth2B1 + epsdiss3*PDdissipationNth3B1 + (dotXt1 - 
-      B1L*BetaDriver*eta)*ShiftBCoeff + 
-      ShiftAdvectionCoeff*(beta1L*(PDupwindNthAnti1B1 - PDupwindNthAnti1Xt1) 
-      + beta2L*(PDupwindNthAnti2B1 - PDupwindNthAnti2Xt1) + 
-      beta3L*(PDupwindNthAnti3B1 - PDupwindNthAnti3Xt1) + (PDupwindNthSymm1B1 
-      - PDupwindNthSymm1Xt1)*Abs(beta1L) + (PDupwindNthSymm2B1 - 
-      PDupwindNthSymm2Xt1)*Abs(beta2L) + (PDupwindNthSymm3B1 - 
-      PDupwindNthSymm3Xt1)*Abs(beta3L));
-    
-    CCTK_REAL_VEC B2rhsL = epsdiss1*PDdissipationNth1B2 + 
-      epsdiss2*PDdissipationNth2B2 + epsdiss3*PDdissipationNth3B2 + (dotXt2 - 
-      B2L*BetaDriver*eta)*ShiftBCoeff + 
-      ShiftAdvectionCoeff*(beta1L*(PDupwindNthAnti1B2 - PDupwindNthAnti1Xt2) 
-      + beta2L*(PDupwindNthAnti2B2 - PDupwindNthAnti2Xt2) + 
-      beta3L*(PDupwindNthAnti3B2 - PDupwindNthAnti3Xt2) + (PDupwindNthSymm1B2 
-      - PDupwindNthSymm1Xt2)*Abs(beta1L) + (PDupwindNthSymm2B2 - 
-      PDupwindNthSymm2Xt2)*Abs(beta2L) + (PDupwindNthSymm3B2 - 
-      PDupwindNthSymm3Xt2)*Abs(beta3L));
-    
-    CCTK_REAL_VEC B3rhsL = epsdiss1*PDdissipationNth1B3 + 
-      epsdiss2*PDdissipationNth2B3 + epsdiss3*PDdissipationNth3B3 + (dotXt3 - 
-      B3L*BetaDriver*eta)*ShiftBCoeff + 
-      ShiftAdvectionCoeff*(beta1L*(PDupwindNthAnti1B3 - PDupwindNthAnti1Xt3) 
-      + beta2L*(PDupwindNthAnti2B3 - PDupwindNthAnti2Xt3) + 
-      beta3L*(PDupwindNthAnti3B3 - PDupwindNthAnti3Xt3) + (PDupwindNthSymm1B3 
-      - PDupwindNthSymm1Xt3)*Abs(beta1L) + (PDupwindNthSymm2B3 - 
-      PDupwindNthSymm2Xt3)*Abs(beta2L) + (PDupwindNthSymm3B3 - 
-      PDupwindNthSymm3Xt3)*Abs(beta3L));
-    
-    
-    /* Copy local copies back to grid functions */
-    vec_store_nta(alpharhs[index],alpharhsL);
-    vec_store_nta(Arhs[index],ArhsL);
-    vec_store_nta(B1rhs[index],B1rhsL);
-    vec_store_nta(B2rhs[index],B2rhsL);
-    vec_store_nta(B3rhs[index],B3rhsL);
-    vec_store_nta(beta1rhs[index],beta1rhsL);
-    vec_store_nta(beta2rhs[index],beta2rhsL);
-    vec_store_nta(beta3rhs[index],beta3rhsL);
-    vec_store_nta(gt11rhs[index],gt11rhsL);
-    vec_store_nta(gt12rhs[index],gt12rhsL);
-    vec_store_nta(gt13rhs[index],gt13rhsL);
-    vec_store_nta(gt22rhs[index],gt22rhsL);
-    vec_store_nta(gt23rhs[index],gt23rhsL);
-    vec_store_nta(gt33rhs[index],gt33rhsL);
-    vec_store_nta(phirhs[index],phirhsL);
-    vec_store_nta(trKrhs[index],trKrhsL);
-    vec_store_nta(Xt1rhs[index],Xt1rhsL);
-    vec_store_nta(Xt2rhs[index],Xt2rhsL);
-    vec_store_nta(Xt3rhs[index],Xt3rhsL);
-  i += CCTK_REAL_VEC_SIZE-1;
-  }
-  LC_ENDLOOP3 (ML_BSSN_O8_RHS1);
-}
-
-extern "C" void ML_BSSN_O8_RHS1(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_O8_RHS1_Body);
-}
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_RHS2.cc b/ML_BSSN_O8/src/ML_BSSN_O8_RHS2.c
index a794e62..fa17031 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_RHS2.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_RHS2.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -95,327 +94,327 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
     // int index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
     /* Declare derivatives */
-    // CCTK_REAL_VEC PDstandardNth1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13alpha = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23alpha = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1At11 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2At11 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3At11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1At11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1At11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2At11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2At11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3At11 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3At11 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1At12 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2At12 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3At12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1At12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1At12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2At12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2At12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3At12 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3At12 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1At13 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2At13 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3At13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1At13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1At13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2At13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2At13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3At13 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3At13 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1At22 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2At22 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3At22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1At22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1At22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2At22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2At22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3At22 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3At22 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1At23 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2At23 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3At23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1At23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1At23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2At23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2At23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3At23 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3At23 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth1At33 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth2At33 = INITVALUE;
-    // CCTK_REAL_VEC PDdissipationNth3At33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1At33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1At33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2At33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2At33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3At33 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3At33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3Xt3 = INITVALUE;
+    // CCTK_REAL PDstandardNth1alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth2alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth3alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth11alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth22alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth33alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth12alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth13alpha = INITVALUE;
+    // CCTK_REAL PDstandardNth23alpha = INITVALUE;
+    // CCTK_REAL PDdissipationNth1At11 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2At11 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3At11 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1At11 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1At11 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2At11 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2At11 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3At11 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3At11 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1At12 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2At12 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3At12 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1At12 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1At12 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2At12 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2At12 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3At12 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3At12 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1At13 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2At13 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3At13 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1At13 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1At13 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2At13 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2At13 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3At13 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3At13 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1At22 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2At22 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3At22 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1At22 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1At22 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2At22 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2At22 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3At22 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3At22 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1At23 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2At23 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3At23 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1At23 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1At23 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2At23 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2At23 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3At23 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3At23 = INITVALUE;
+    // CCTK_REAL PDdissipationNth1At33 = INITVALUE;
+    // CCTK_REAL PDdissipationNth2At33 = INITVALUE;
+    // CCTK_REAL PDdissipationNth3At33 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1At33 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1At33 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2At33 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2At33 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3At33 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3At33 = INITVALUE;
+    // CCTK_REAL PDstandardNth1beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth2beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth3beta1 = INITVALUE;
+    // CCTK_REAL PDstandardNth1beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth2beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth3beta2 = INITVALUE;
+    // CCTK_REAL PDstandardNth1beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth2beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth3beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth1phi = INITVALUE;
+    // CCTK_REAL PDstandardNth2phi = INITVALUE;
+    // CCTK_REAL PDstandardNth3phi = INITVALUE;
+    // CCTK_REAL PDstandardNth11phi = INITVALUE;
+    // CCTK_REAL PDstandardNth22phi = INITVALUE;
+    // CCTK_REAL PDstandardNth33phi = INITVALUE;
+    // CCTK_REAL PDstandardNth12phi = INITVALUE;
+    // CCTK_REAL PDstandardNth13phi = INITVALUE;
+    // CCTK_REAL PDstandardNth23phi = INITVALUE;
+    // CCTK_REAL PDstandardNth1Xt1 = INITVALUE;
+    // CCTK_REAL PDstandardNth2Xt1 = INITVALUE;
+    // CCTK_REAL PDstandardNth3Xt1 = INITVALUE;
+    // CCTK_REAL PDstandardNth1Xt2 = INITVALUE;
+    // CCTK_REAL PDstandardNth2Xt2 = INITVALUE;
+    // CCTK_REAL PDstandardNth3Xt2 = INITVALUE;
+    // CCTK_REAL PDstandardNth1Xt3 = INITVALUE;
+    // CCTK_REAL PDstandardNth2Xt3 = INITVALUE;
+    // CCTK_REAL PDstandardNth3Xt3 = INITVALUE;
     
     /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  At11L = vec_load(At11[index]);
-    CCTK_REAL_VEC  At12L = vec_load(At12[index]);
-    CCTK_REAL_VEC  At13L = vec_load(At13[index]);
-    CCTK_REAL_VEC  At22L = vec_load(At22[index]);
-    CCTK_REAL_VEC  At23L = vec_load(At23[index]);
-    CCTK_REAL_VEC  At33L = vec_load(At33[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  eTxxL = (*stress_energy_state) ? vec_load(eTxx[index]) : 0.0;
-    CCTK_REAL_VEC  eTxyL = (*stress_energy_state) ? vec_load(eTxy[index]) : 0.0;
-    CCTK_REAL_VEC  eTxzL = (*stress_energy_state) ? vec_load(eTxz[index]) : 0.0;
-    CCTK_REAL_VEC  eTyyL = (*stress_energy_state) ? vec_load(eTyy[index]) : 0.0;
-    CCTK_REAL_VEC  eTyzL = (*stress_energy_state) ? vec_load(eTyz[index]) : 0.0;
-    CCTK_REAL_VEC  eTzzL = (*stress_energy_state) ? vec_load(eTzz[index]) : 0.0;
-    CCTK_REAL_VEC  gt11L = vec_load(gt11[index]);
-    CCTK_REAL_VEC  gt12L = vec_load(gt12[index]);
-    CCTK_REAL_VEC  gt13L = vec_load(gt13[index]);
-    CCTK_REAL_VEC  gt22L = vec_load(gt22[index]);
-    CCTK_REAL_VEC  gt23L = vec_load(gt23[index]);
-    CCTK_REAL_VEC  gt33L = vec_load(gt33[index]);
-    CCTK_REAL_VEC  phiL = vec_load(phi[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
-    CCTK_REAL_VEC  Xt1L = vec_load(Xt1[index]);
-    CCTK_REAL_VEC  Xt2L = vec_load(Xt2[index]);
-    CCTK_REAL_VEC  Xt3L = vec_load(Xt3[index]);
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  At11L = At11[index];
+    CCTK_REAL  At12L = At12[index];
+    CCTK_REAL  At13L = At13[index];
+    CCTK_REAL  At22L = At22[index];
+    CCTK_REAL  At23L = At23[index];
+    CCTK_REAL  At33L = At33[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  eTxxL = (*stress_energy_state) ? (eTxx[index]) : 0.0;
+    CCTK_REAL  eTxyL = (*stress_energy_state) ? (eTxy[index]) : 0.0;
+    CCTK_REAL  eTxzL = (*stress_energy_state) ? (eTxz[index]) : 0.0;
+    CCTK_REAL  eTyyL = (*stress_energy_state) ? (eTyy[index]) : 0.0;
+    CCTK_REAL  eTyzL = (*stress_energy_state) ? (eTyz[index]) : 0.0;
+    CCTK_REAL  eTzzL = (*stress_energy_state) ? (eTzz[index]) : 0.0;
+    CCTK_REAL  gt11L = gt11[index];
+    CCTK_REAL  gt12L = gt12[index];
+    CCTK_REAL  gt13L = gt13[index];
+    CCTK_REAL  gt22L = gt22[index];
+    CCTK_REAL  gt23L = gt23[index];
+    CCTK_REAL  gt33L = gt33[index];
+    CCTK_REAL  phiL = phi[index];
+    CCTK_REAL  trKL = trK[index];
+    CCTK_REAL  Xt1L = Xt1[index];
+    CCTK_REAL  Xt2L = Xt2[index];
+    CCTK_REAL  Xt3L = Xt3[index];
     
     /* Include user supplied include files */
     
     /* Precompute derivatives */
-    CCTK_REAL_VEC const PDstandardNth1alpha = PDstandardNth1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2alpha = PDstandardNth2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3alpha = PDstandardNth3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11alpha = PDstandardNth11(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22alpha = PDstandardNth22(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33alpha = PDstandardNth33(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12alpha = PDstandardNth12(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13alpha = PDstandardNth13(alpha, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23alpha = PDstandardNth23(alpha, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1At11 = PDdissipationNth1(At11, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2At11 = PDdissipationNth2(At11, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3At11 = PDdissipationNth3(At11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1At11 = PDupwindNthAnti1(At11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1At11 = PDupwindNthSymm1(At11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2At11 = PDupwindNthAnti2(At11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2At11 = PDupwindNthSymm2(At11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3At11 = PDupwindNthAnti3(At11, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3At11 = PDupwindNthSymm3(At11, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1At12 = PDdissipationNth1(At12, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2At12 = PDdissipationNth2(At12, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3At12 = PDdissipationNth3(At12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1At12 = PDupwindNthAnti1(At12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1At12 = PDupwindNthSymm1(At12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2At12 = PDupwindNthAnti2(At12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2At12 = PDupwindNthSymm2(At12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3At12 = PDupwindNthAnti3(At12, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3At12 = PDupwindNthSymm3(At12, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1At13 = PDdissipationNth1(At13, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2At13 = PDdissipationNth2(At13, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3At13 = PDdissipationNth3(At13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1At13 = PDupwindNthAnti1(At13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1At13 = PDupwindNthSymm1(At13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2At13 = PDupwindNthAnti2(At13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2At13 = PDupwindNthSymm2(At13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3At13 = PDupwindNthAnti3(At13, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3At13 = PDupwindNthSymm3(At13, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1At22 = PDdissipationNth1(At22, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2At22 = PDdissipationNth2(At22, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3At22 = PDdissipationNth3(At22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1At22 = PDupwindNthAnti1(At22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1At22 = PDupwindNthSymm1(At22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2At22 = PDupwindNthAnti2(At22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2At22 = PDupwindNthSymm2(At22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3At22 = PDupwindNthAnti3(At22, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3At22 = PDupwindNthSymm3(At22, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1At23 = PDdissipationNth1(At23, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2At23 = PDdissipationNth2(At23, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3At23 = PDdissipationNth3(At23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1At23 = PDupwindNthAnti1(At23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1At23 = PDupwindNthSymm1(At23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2At23 = PDupwindNthAnti2(At23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2At23 = PDupwindNthSymm2(At23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3At23 = PDupwindNthAnti3(At23, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3At23 = PDupwindNthSymm3(At23, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth1At33 = PDdissipationNth1(At33, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth2At33 = PDdissipationNth2(At33, i, j, k);
-    CCTK_REAL_VEC const PDdissipationNth3At33 = PDdissipationNth3(At33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1At33 = PDupwindNthAnti1(At33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1At33 = PDupwindNthSymm1(At33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2At33 = PDupwindNthAnti2(At33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2At33 = PDupwindNthSymm2(At33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3At33 = PDupwindNthAnti3(At33, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3At33 = PDupwindNthSymm3(At33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1beta1 = PDstandardNth1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2beta1 = PDstandardNth2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3beta1 = PDstandardNth3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1beta2 = PDstandardNth1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2beta2 = PDstandardNth2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3beta2 = PDstandardNth3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1beta3 = PDstandardNth1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2beta3 = PDstandardNth2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3beta3 = PDstandardNth3(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt11 = PDstandardNth11(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt11 = PDstandardNth22(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt11 = PDstandardNth33(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt11 = PDstandardNth12(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt11 = PDstandardNth13(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt11 = PDstandardNth23(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt12 = PDstandardNth1(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt12 = PDstandardNth2(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt12 = PDstandardNth3(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt12 = PDstandardNth11(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt12 = PDstandardNth22(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt12 = PDstandardNth33(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt12 = PDstandardNth12(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt12 = PDstandardNth13(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt12 = PDstandardNth23(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt13 = PDstandardNth1(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt13 = PDstandardNth2(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt13 = PDstandardNth3(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt13 = PDstandardNth11(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt13 = PDstandardNth22(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt13 = PDstandardNth33(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt13 = PDstandardNth12(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt13 = PDstandardNth13(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt13 = PDstandardNth23(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt22 = PDstandardNth1(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt22 = PDstandardNth2(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt22 = PDstandardNth3(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt22 = PDstandardNth11(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt22 = PDstandardNth22(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt22 = PDstandardNth33(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt22 = PDstandardNth12(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt22 = PDstandardNth13(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt22 = PDstandardNth23(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt23 = PDstandardNth1(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt23 = PDstandardNth2(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt23 = PDstandardNth3(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt23 = PDstandardNth11(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt23 = PDstandardNth22(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt23 = PDstandardNth33(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt23 = PDstandardNth12(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt23 = PDstandardNth13(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt23 = PDstandardNth23(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt33 = PDstandardNth1(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt33 = PDstandardNth11(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt33 = PDstandardNth22(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt33 = PDstandardNth33(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt33 = PDstandardNth12(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt33 = PDstandardNth13(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt33 = PDstandardNth23(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1phi = PDstandardNth1(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2phi = PDstandardNth2(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3phi = PDstandardNth3(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11phi = PDstandardNth11(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22phi = PDstandardNth22(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33phi = PDstandardNth33(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12phi = PDstandardNth12(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13phi = PDstandardNth13(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23phi = PDstandardNth23(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1Xt1 = PDstandardNth1(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2Xt1 = PDstandardNth2(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3Xt1 = PDstandardNth3(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1Xt2 = PDstandardNth1(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2Xt2 = PDstandardNth2(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3Xt2 = PDstandardNth3(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1Xt3 = PDstandardNth1(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2Xt3 = PDstandardNth2(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3Xt3 = PDstandardNth3(Xt3, i, j, k);
+    CCTK_REAL const PDstandardNth1alpha = PDstandardNth1(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth2alpha = PDstandardNth2(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth3alpha = PDstandardNth3(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth11alpha = PDstandardNth11(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth22alpha = PDstandardNth22(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth33alpha = PDstandardNth33(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth12alpha = PDstandardNth12(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth13alpha = PDstandardNth13(alpha, i, j, k);
+    CCTK_REAL const PDstandardNth23alpha = PDstandardNth23(alpha, i, j, k);
+    CCTK_REAL const PDdissipationNth1At11 = PDdissipationNth1(At11, i, j, k);
+    CCTK_REAL const PDdissipationNth2At11 = PDdissipationNth2(At11, i, j, k);
+    CCTK_REAL const PDdissipationNth3At11 = PDdissipationNth3(At11, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1At11 = PDupwindNthAnti1(At11, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1At11 = PDupwindNthSymm1(At11, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2At11 = PDupwindNthAnti2(At11, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2At11 = PDupwindNthSymm2(At11, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3At11 = PDupwindNthAnti3(At11, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3At11 = PDupwindNthSymm3(At11, i, j, k);
+    CCTK_REAL const PDdissipationNth1At12 = PDdissipationNth1(At12, i, j, k);
+    CCTK_REAL const PDdissipationNth2At12 = PDdissipationNth2(At12, i, j, k);
+    CCTK_REAL const PDdissipationNth3At12 = PDdissipationNth3(At12, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1At12 = PDupwindNthAnti1(At12, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1At12 = PDupwindNthSymm1(At12, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2At12 = PDupwindNthAnti2(At12, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2At12 = PDupwindNthSymm2(At12, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3At12 = PDupwindNthAnti3(At12, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3At12 = PDupwindNthSymm3(At12, i, j, k);
+    CCTK_REAL const PDdissipationNth1At13 = PDdissipationNth1(At13, i, j, k);
+    CCTK_REAL const PDdissipationNth2At13 = PDdissipationNth2(At13, i, j, k);
+    CCTK_REAL const PDdissipationNth3At13 = PDdissipationNth3(At13, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1At13 = PDupwindNthAnti1(At13, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1At13 = PDupwindNthSymm1(At13, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2At13 = PDupwindNthAnti2(At13, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2At13 = PDupwindNthSymm2(At13, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3At13 = PDupwindNthAnti3(At13, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3At13 = PDupwindNthSymm3(At13, i, j, k);
+    CCTK_REAL const PDdissipationNth1At22 = PDdissipationNth1(At22, i, j, k);
+    CCTK_REAL const PDdissipationNth2At22 = PDdissipationNth2(At22, i, j, k);
+    CCTK_REAL const PDdissipationNth3At22 = PDdissipationNth3(At22, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1At22 = PDupwindNthAnti1(At22, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1At22 = PDupwindNthSymm1(At22, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2At22 = PDupwindNthAnti2(At22, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2At22 = PDupwindNthSymm2(At22, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3At22 = PDupwindNthAnti3(At22, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3At22 = PDupwindNthSymm3(At22, i, j, k);
+    CCTK_REAL const PDdissipationNth1At23 = PDdissipationNth1(At23, i, j, k);
+    CCTK_REAL const PDdissipationNth2At23 = PDdissipationNth2(At23, i, j, k);
+    CCTK_REAL const PDdissipationNth3At23 = PDdissipationNth3(At23, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1At23 = PDupwindNthAnti1(At23, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1At23 = PDupwindNthSymm1(At23, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2At23 = PDupwindNthAnti2(At23, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2At23 = PDupwindNthSymm2(At23, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3At23 = PDupwindNthAnti3(At23, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3At23 = PDupwindNthSymm3(At23, i, j, k);
+    CCTK_REAL const PDdissipationNth1At33 = PDdissipationNth1(At33, i, j, k);
+    CCTK_REAL const PDdissipationNth2At33 = PDdissipationNth2(At33, i, j, k);
+    CCTK_REAL const PDdissipationNth3At33 = PDdissipationNth3(At33, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1At33 = PDupwindNthAnti1(At33, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1At33 = PDupwindNthSymm1(At33, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2At33 = PDupwindNthAnti2(At33, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2At33 = PDupwindNthSymm2(At33, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3At33 = PDupwindNthAnti3(At33, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3At33 = PDupwindNthSymm3(At33, i, j, k);
+    CCTK_REAL const PDstandardNth1beta1 = PDstandardNth1(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth2beta1 = PDstandardNth2(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth3beta1 = PDstandardNth3(beta1, i, j, k);
+    CCTK_REAL const PDstandardNth1beta2 = PDstandardNth1(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth2beta2 = PDstandardNth2(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth3beta2 = PDstandardNth3(beta2, i, j, k);
+    CCTK_REAL const PDstandardNth1beta3 = PDstandardNth1(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth2beta3 = PDstandardNth2(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth3beta3 = PDstandardNth3(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth11gt11 = PDstandardNth11(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth22gt11 = PDstandardNth22(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth33gt11 = PDstandardNth33(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth12gt11 = PDstandardNth12(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth13gt11 = PDstandardNth13(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth23gt11 = PDstandardNth23(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth1gt12 = PDstandardNth1(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth2gt12 = PDstandardNth2(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth3gt12 = PDstandardNth3(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth11gt12 = PDstandardNth11(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth22gt12 = PDstandardNth22(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth33gt12 = PDstandardNth33(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth12gt12 = PDstandardNth12(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth13gt12 = PDstandardNth13(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth23gt12 = PDstandardNth23(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth1gt13 = PDstandardNth1(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth2gt13 = PDstandardNth2(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth3gt13 = PDstandardNth3(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth11gt13 = PDstandardNth11(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth22gt13 = PDstandardNth22(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth33gt13 = PDstandardNth33(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth12gt13 = PDstandardNth12(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth13gt13 = PDstandardNth13(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth23gt13 = PDstandardNth23(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth1gt22 = PDstandardNth1(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth2gt22 = PDstandardNth2(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth3gt22 = PDstandardNth3(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth11gt22 = PDstandardNth11(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth22gt22 = PDstandardNth22(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth33gt22 = PDstandardNth33(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth12gt22 = PDstandardNth12(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth13gt22 = PDstandardNth13(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth23gt22 = PDstandardNth23(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth1gt23 = PDstandardNth1(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth2gt23 = PDstandardNth2(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth3gt23 = PDstandardNth3(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth11gt23 = PDstandardNth11(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth22gt23 = PDstandardNth22(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth33gt23 = PDstandardNth33(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth12gt23 = PDstandardNth12(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth13gt23 = PDstandardNth13(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth23gt23 = PDstandardNth23(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth1gt33 = PDstandardNth1(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth11gt33 = PDstandardNth11(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth22gt33 = PDstandardNth22(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth33gt33 = PDstandardNth33(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth12gt33 = PDstandardNth12(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth13gt33 = PDstandardNth13(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth23gt33 = PDstandardNth23(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth1phi = PDstandardNth1(phi, i, j, k);
+    CCTK_REAL const PDstandardNth2phi = PDstandardNth2(phi, i, j, k);
+    CCTK_REAL const PDstandardNth3phi = PDstandardNth3(phi, i, j, k);
+    CCTK_REAL const PDstandardNth11phi = PDstandardNth11(phi, i, j, k);
+    CCTK_REAL const PDstandardNth22phi = PDstandardNth22(phi, i, j, k);
+    CCTK_REAL const PDstandardNth33phi = PDstandardNth33(phi, i, j, k);
+    CCTK_REAL const PDstandardNth12phi = PDstandardNth12(phi, i, j, k);
+    CCTK_REAL const PDstandardNth13phi = PDstandardNth13(phi, i, j, k);
+    CCTK_REAL const PDstandardNth23phi = PDstandardNth23(phi, i, j, k);
+    CCTK_REAL const PDstandardNth1Xt1 = PDstandardNth1(Xt1, i, j, k);
+    CCTK_REAL const PDstandardNth2Xt1 = PDstandardNth2(Xt1, i, j, k);
+    CCTK_REAL const PDstandardNth3Xt1 = PDstandardNth3(Xt1, i, j, k);
+    CCTK_REAL const PDstandardNth1Xt2 = PDstandardNth1(Xt2, i, j, k);
+    CCTK_REAL const PDstandardNth2Xt2 = PDstandardNth2(Xt2, i, j, k);
+    CCTK_REAL const PDstandardNth3Xt2 = PDstandardNth3(Xt2, i, j, k);
+    CCTK_REAL const PDstandardNth1Xt3 = PDstandardNth1(Xt3, i, j, k);
+    CCTK_REAL const PDstandardNth2Xt3 = PDstandardNth2(Xt3, i, j, k);
+    CCTK_REAL const PDstandardNth3Xt3 = PDstandardNth3(Xt3, i, j, k);
     
     /* Calculate temporaries and grid functions */
     int dir1 = Sign(beta1L);
@@ -424,108 +423,108 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
     
     int dir3 = Sign(beta3L);
     
-    CCTK_REAL_VEC epsdiss1 = EpsDiss;
+    CCTK_REAL epsdiss1 = EpsDiss;
     
-    CCTK_REAL_VEC epsdiss2 = EpsDiss;
+    CCTK_REAL epsdiss2 = EpsDiss;
     
-    CCTK_REAL_VEC epsdiss3 = EpsDiss;
+    CCTK_REAL epsdiss3 = EpsDiss;
     
-    CCTK_REAL_VEC detgt = 1;
+    CCTK_REAL detgt = 1;
     
-    CCTK_REAL_VEC gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
+    CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
     
-    CCTK_REAL_VEC gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
+    CCTK_REAL gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
+    CCTK_REAL gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
+    CCTK_REAL gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
     
-    CCTK_REAL_VEC gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
+    CCTK_REAL gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
+    CCTK_REAL gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
     
-    CCTK_REAL_VEC Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
+    CCTK_REAL Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
       2*(gtu21*PDstandardNth1gt12 + gtu31*PDstandardNth1gt13) - 
       gtu21*PDstandardNth2gt11 - gtu31*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
+    CCTK_REAL Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
       2*(gtu22*PDstandardNth1gt12 + gtu32*PDstandardNth1gt13) - 
       gtu22*PDstandardNth2gt11 - gtu32*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
+    CCTK_REAL Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
       2*(gtu32*PDstandardNth1gt12 + gtu33*PDstandardNth1gt13) - 
       gtu32*PDstandardNth2gt11 - gtu33*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
+    CCTK_REAL Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
       gtu11*PDstandardNth2gt11 + gtu31*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
+    CCTK_REAL Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
       gtu21*PDstandardNth2gt11 + gtu32*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
+    CCTK_REAL Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
       gtu31*PDstandardNth2gt11 + gtu33*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
+    CCTK_REAL Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
       gtu11*PDstandardNth3gt11 + gtu21*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
+    CCTK_REAL Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
       gtu21*PDstandardNth3gt11 + gtu22*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
+    CCTK_REAL Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
       gtu31*PDstandardNth3gt11 + gtu32*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu21*PDstandardNth2gt22 + 
       gtu31*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu22*PDstandardNth2gt22 + 
       gtu32*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu32*PDstandardNth2gt22 + 
       gtu33*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
+    CCTK_REAL Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
       gtu11*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu21*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
+    CCTK_REAL Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
       gtu21*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu22*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
+    CCTK_REAL Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
       gtu31*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu32*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
+    CCTK_REAL Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
       gtu21*PDstandardNth2gt33 + 2*gtu11*PDstandardNth3gt13 + 
       2*gtu21*PDstandardNth3gt23 + gtu31*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
+    CCTK_REAL Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
       gtu22*PDstandardNth2gt33 + 2*gtu21*PDstandardNth3gt13 + 
       2*gtu22*PDstandardNth3gt23 + gtu32*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
+    CCTK_REAL Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
       gtu32*PDstandardNth2gt33 + 2*gtu31*PDstandardNth3gt13 + 
       2*gtu32*PDstandardNth3gt23 + gtu33*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Xtn1 = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
+    CCTK_REAL Xtn1 = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
       Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33;
     
-    CCTK_REAL_VEC Xtn2 = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
+    CCTK_REAL Xtn2 = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
       Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33;
     
-    CCTK_REAL_VEC Xtn3 = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
+    CCTK_REAL Xtn3 = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
       Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
     
-    CCTK_REAL_VEC Rt11 = -(gtu11*khalf*PDstandardNth11gt11) + 
+    CCTK_REAL Rt11 = -(gtu11*khalf*PDstandardNth11gt11) + 
       gtu21*(2*Gt211*Gt212*gt22L + 4*Gt112*gt13L*Gt311 + 2*Gt113*gt11L*Gt312 
       + 2*gt13L*Gt312*Gt313 + 2*gt13L*Gt211*Gt322 + 2*gt13L*Gt311*Gt323 + 
       2*Gt311*Gt312*gt33L - PDstandardNth12gt11) - gtu31*PDstandardNth13gt11 
@@ -576,7 +575,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       gt33L*gtu22*SQR(Gt312) + 2*gt13L*gtu31*SQR(Gt313) + 
       gt33L*gtu33*SQR(Gt313);
     
-    CCTK_REAL_VEC Rt12 = khalf*(-(gtu11*PDstandardNth11gt12) - 
+    CCTK_REAL Rt12 = khalf*(-(gtu11*PDstandardNth11gt12) - 
       2*gtu21*PDstandardNth12gt12 - 2*gtu31*PDstandardNth13gt12 + 
       gt12L*PDstandardNth1Xt1 + gt22L*PDstandardNth1Xt2 + 
       gt23L*PDstandardNth1Xt3 - gtu22*PDstandardNth22gt12 - 
@@ -649,7 +648,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       gt13L*Gt323) + gt12L*(Gt122*Gt213 + Gt123*(2*Gt212 + Gt313) + 
       Gt223*(Gt222 + Gt323)) + Gt312*Gt323*gt33L + gt13L*SQR(Gt323)));
     
-    CCTK_REAL_VEC Rt13 = khalf*(-(gtu11*PDstandardNth11gt13) - 
+    CCTK_REAL Rt13 = khalf*(-(gtu11*PDstandardNth11gt13) - 
       2*gtu21*PDstandardNth12gt13 - 2*gtu31*PDstandardNth13gt13 + 
       gt13L*PDstandardNth1Xt1 + gt23L*PDstandardNth1Xt2 + 
       gt33L*PDstandardNth1Xt3 - gtu22*PDstandardNth22gt13 - 
@@ -724,15 +723,15 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       Gt113*(2*gt11L*Gt133 + gt12L*Gt233 + Gt213*gt23L + gt13L*Gt333 + 
       Gt313*gt33L) + gt13L*SQR(Gt113) + gt13L*SQR(Gt333)));
     
-    CCTK_REAL_VEC Rt22 = 4*(Gt122*gt12L*Gt212*gtu21 + 
-      Gt112*gt12L*Gt222*gtu21 + Gt122*gt12L*Gt222*gtu22 + 
-      Gt123*gt12L*Gt212*gtu31 + Gt123*gt12L*Gt222*gtu32 + 
-      Gt123*gt12L*Gt223*gtu33) - gtu11*khalf*PDstandardNth11gt22 + 
-      gtu21*(6*Gt212*Gt222*gt22L + 2*Gt122*gt23L*Gt311 + 2*Gt122*gt13L*Gt312 
-      + 4*Gt222*gt23L*Gt312 + 2*Gt113*gt12L*Gt322 + 2*gt23L*Gt312*Gt323 + 
-      2*Gt312*Gt322*gt33L - PDstandardNth12gt22) + gtu31*(6*Gt212*Gt223*gt22L 
-      + 2*Gt123*gt13L*Gt312 + 2*Gt112*gt23L*Gt313 + 2*Gt113*gt12L*Gt323 + 
-      2*gt23L*Gt312*Gt333 + 2*Gt312*Gt323*gt33L - PDstandardNth13gt22) - 
+    CCTK_REAL Rt22 = 4*(Gt122*gt12L*Gt212*gtu21 + Gt112*gt12L*Gt222*gtu21 
+      + Gt122*gt12L*Gt222*gtu22 + Gt123*gt12L*Gt212*gtu31 + 
+      Gt123*gt12L*Gt222*gtu32 + Gt123*gt12L*Gt223*gtu33) - 
+      gtu11*khalf*PDstandardNth11gt22 + gtu21*(6*Gt212*Gt222*gt22L + 
+      2*Gt122*gt23L*Gt311 + 2*Gt122*gt13L*Gt312 + 4*Gt222*gt23L*Gt312 + 
+      2*Gt113*gt12L*Gt322 + 2*gt23L*Gt312*Gt323 + 2*Gt312*Gt322*gt33L - 
+      PDstandardNth12gt22) + gtu31*(6*Gt212*Gt223*gt22L + 2*Gt123*gt13L*Gt312 
+      + 2*Gt112*gt23L*Gt313 + 2*Gt113*gt12L*Gt323 + 2*gt23L*Gt312*Gt333 + 
+      2*Gt312*Gt323*gt33L - PDstandardNth13gt22) - 
       gtu22*khalf*PDstandardNth22gt22 + gtu32*(4*Gt122*gt12L*Gt223 + 
       2*Gt123*Gt212*gt22L + 2*gt12L*Gt133*Gt322 + 4*Gt223*gt23L*Gt322 + 
       2*Gt123*gt12L*Gt323 + 4*Gt222*gt23L*Gt323 + 2*gt23L*Gt322*Gt333 + 
@@ -773,7 +772,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       gt33L*gtu11*SQR(Gt312) + gt33L*gtu22*SQR(Gt322) + 
       2*gt23L*gtu32*SQR(Gt323) + gt33L*gtu33*SQR(Gt323);
     
-    CCTK_REAL_VEC Rt23 = khalf*(-(gtu11*PDstandardNth11gt23) - 
+    CCTK_REAL Rt23 = khalf*(-(gtu11*PDstandardNth11gt23) - 
       2*gtu21*PDstandardNth12gt23 - 2*gtu31*PDstandardNth13gt23 - 
       gtu22*PDstandardNth22gt23 - 2*gtu32*PDstandardNth23gt23 + 
       gt13L*PDstandardNth2Xt1 + gt23L*PDstandardNth2Xt2 + 
@@ -852,220 +851,219 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       Gt223*gt23L*Gt333 + Gt123*Gt313*gt33L + Gt223*Gt323*gt33L + 
       2*Gt323*Gt333*gt33L + gt23L*SQR(Gt223) + gt23L*SQR(Gt333)));
     
-    CCTK_REAL_VEC Rt33 = 4*(Gt123*gt13L*Gt323*gtu22 + 
-      Gt223*gt23L*Gt323*gtu22 + Gt133*gt13L*Gt313*gtu31 + 
-      Gt233*gt23L*Gt313*gtu31 + Gt113*gt13L*Gt333*gtu31 + 
-      Gt133*gt13L*Gt323*gtu32 + Gt233*gt23L*Gt323*gtu32 + 
-      Gt123*gt13L*Gt333*gtu32 + Gt133*gt13L*Gt333*gtu33) + 
-      gtu21*(2*Gt212*Gt223*gt23L + 4*Gt123*gt13L*Gt313 + 4*Gt223*gt23L*Gt313 
-      + 4*Gt113*gt13L*Gt323 + 4*Gt213*gt23L*Gt323 + 2*Gt123*Gt311*gt33L - 
-      PDstandardNth12gt33) + gtu31*(4*Gt213*gt23L*Gt333 + 2*Gt233*Gt312*gt33L 
-      + 6*Gt313*Gt333*gt33L - PDstandardNth13gt33) - 
-      gtu22*khalf*PDstandardNth22gt33 + gtu32*(4*Gt223*gt23L*Gt333 + 
-      2*Gt123*Gt313*gt33L + 6*Gt323*Gt333*gt33L - PDstandardNth23gt33) - 
-      gtu33*khalf*PDstandardNth33gt33 + gt13L*PDstandardNth3Xt1 + 
-      gt23L*PDstandardNth3Xt2 + gt33L*(2*Gt213*Gt322*gtu21 + 
-      6*Gt313*Gt323*gtu21 + 2*Gt123*Gt312*gtu22 + 2*Gt133*Gt311*gtu31 + 
-      2*Gt133*Gt312*gtu32 + 2*Gt133*Gt313*gtu33 + PDstandardNth3Xt3) + 
-      Gt113*gt13L*Xtn1 + Gt213*gt23L*Xtn1 + Gt313*gt33L*Xtn1 + 
-      Gt123*gt13L*Xtn2 + Gt223*gt23L*Xtn2 + Gt323*gt33L*Xtn2 + 
-      Gt133*gt13L*Xtn3 + Gt333*gt33L*Xtn3 + Gt233*(4*gt23L*Gt333*gtu33 + 
-      2*Gt323*gt33L*gtu33 + gt23L*Xtn3) + gtu11*(2*Gt212*Gt213*gt23L + 
-      4*Gt113*gt13L*Gt313 + 4*Gt213*gt23L*Gt313 + 2*Gt113*Gt311*gt33L + 
-      2*Gt213*Gt312*gt33L - khalf*PDstandardNth11gt33 + gt11L*SQR(Gt113)) + 
-      2*(Gt111*Gt113*gt13L*gtu11 + Gt113*gt12L*Gt213*gtu11 + 
-      Gt112*gt13L*Gt213*gtu11 + Gt113*Gt211*gt23L*gtu11 + 
-      Gt113*gt11L*Gt123*gtu21 + Gt112*Gt113*gt13L*gtu21 + 
-      Gt111*Gt123*gt13L*gtu21 + Gt123*gt12L*Gt213*gtu21 + 
-      Gt122*gt13L*Gt213*gtu21 + Gt113*gt12L*Gt223*gtu21 + 
-      Gt112*gt13L*Gt223*gtu21 + Gt213*Gt223*gt22L*gtu21 + 
-      Gt123*Gt211*gt23L*gtu21 + Gt113*Gt212*gt23L*gtu21 + 
-      Gt213*Gt222*gt23L*gtu21 + Gt113*Gt312*gt33L*gtu21 + 
-      Gt223*Gt312*gt33L*gtu21 + Gt112*Gt123*gt13L*gtu22 + 
-      Gt123*gt12L*Gt223*gtu22 + Gt122*gt13L*Gt223*gtu22 + 
-      Gt123*Gt212*gt23L*gtu22 + Gt222*Gt223*gt23L*gtu22 + 
-      Gt223*Gt322*gt33L*gtu22 + Gt113*gt11L*Gt133*gtu31 + 
-      Gt111*Gt133*gt13L*gtu31 + gt12L*Gt133*Gt213*gtu31 + 
-      Gt123*gt13L*Gt213*gtu31 + Gt113*gt12L*Gt233*gtu31 + 
-      Gt112*gt13L*Gt233*gtu31 + Gt213*gt22L*Gt233*gtu31 + 
-      Gt133*Gt211*gt23L*gtu31 + Gt113*Gt213*gt23L*gtu31 + 
-      Gt213*Gt223*gt23L*gtu31 + Gt212*Gt233*gt23L*gtu31 + 
-      Gt113*Gt313*gt33L*gtu31 + Gt213*Gt323*gt33L*gtu31 + 
-      gt11L*Gt123*Gt133*gtu32 + Gt113*Gt123*gt13L*gtu32 + 
-      Gt112*Gt133*gt13L*gtu32 + gt12L*Gt133*Gt223*gtu32 + 
-      Gt123*gt13L*Gt223*gtu32 + Gt123*gt12L*Gt233*gtu32 + 
-      Gt122*gt13L*Gt233*gtu32 + Gt223*gt22L*Gt233*gtu32 + 
-      Gt133*Gt212*gt23L*gtu32 + Gt123*Gt213*gt23L*gtu32 + 
-      Gt222*Gt233*gt23L*gtu32 + Gt233*Gt322*gt33L*gtu32 + 
-      Gt223*Gt323*gt33L*gtu32 + Gt113*Gt133*gt13L*gtu33 + 
-      gt12L*Gt133*Gt233*gtu33 + Gt123*gt13L*Gt233*gtu33 + 
-      Gt133*Gt213*gt23L*gtu33 + Gt223*Gt233*gt23L*gtu33 + 
-      gt13L*gtu31*SQR(Gt113)) + gt11L*gtu22*SQR(Gt123) + 
-      gt11L*gtu33*SQR(Gt133) + gt22L*gtu11*SQR(Gt213) + 
-      gt22L*gtu22*SQR(Gt223) + 2*gt23L*gtu32*SQR(Gt223) + 
-      gt22L*gtu33*SQR(Gt233) + 3*gt33L*gtu11*SQR(Gt313) + 
-      3*gt33L*gtu22*SQR(Gt323) + 3*gt33L*gtu33*SQR(Gt333);
-    
-    CCTK_REAL_VEC fac1 = IfThen(conformalMethod,-(khalf*INV(phiL)),1);
-    
-    CCTK_REAL_VEC cdphi1 = fac1*PDstandardNth1phi;
-    
-    CCTK_REAL_VEC cdphi2 = fac1*PDstandardNth2phi;
-    
-    CCTK_REAL_VEC cdphi3 = fac1*PDstandardNth3phi;
-    
-    CCTK_REAL_VEC fac2 = IfThen(conformalMethod,khalf*pow(phiL,-2),0);
-    
-    CCTK_REAL_VEC cdphi211 = -(fac1*(-PDstandardNth11phi + 
+    CCTK_REAL Rt33 = 4*(Gt123*gt13L*Gt323*gtu22 + Gt223*gt23L*Gt323*gtu22 
+      + Gt133*gt13L*Gt313*gtu31 + Gt233*gt23L*Gt313*gtu31 + 
+      Gt113*gt13L*Gt333*gtu31 + Gt133*gt13L*Gt323*gtu32 + 
+      Gt233*gt23L*Gt323*gtu32 + Gt123*gt13L*Gt333*gtu32 + 
+      Gt133*gt13L*Gt333*gtu33) + gtu21*(2*Gt212*Gt223*gt23L + 
+      4*Gt123*gt13L*Gt313 + 4*Gt223*gt23L*Gt313 + 4*Gt113*gt13L*Gt323 + 
+      4*Gt213*gt23L*Gt323 + 2*Gt123*Gt311*gt33L - PDstandardNth12gt33) + 
+      gtu31*(4*Gt213*gt23L*Gt333 + 2*Gt233*Gt312*gt33L + 6*Gt313*Gt333*gt33L 
+      - PDstandardNth13gt33) - gtu22*khalf*PDstandardNth22gt33 + 
+      gtu32*(4*Gt223*gt23L*Gt333 + 2*Gt123*Gt313*gt33L + 6*Gt323*Gt333*gt33L 
+      - PDstandardNth23gt33) - gtu33*khalf*PDstandardNth33gt33 + 
+      gt13L*PDstandardNth3Xt1 + gt23L*PDstandardNth3Xt2 + 
+      gt33L*(2*Gt213*Gt322*gtu21 + 6*Gt313*Gt323*gtu21 + 2*Gt123*Gt312*gtu22 
+      + 2*Gt133*Gt311*gtu31 + 2*Gt133*Gt312*gtu32 + 2*Gt133*Gt313*gtu33 + 
+      PDstandardNth3Xt3) + Gt113*gt13L*Xtn1 + Gt213*gt23L*Xtn1 + 
+      Gt313*gt33L*Xtn1 + Gt123*gt13L*Xtn2 + Gt223*gt23L*Xtn2 + 
+      Gt323*gt33L*Xtn2 + Gt133*gt13L*Xtn3 + Gt333*gt33L*Xtn3 + 
+      Gt233*(4*gt23L*Gt333*gtu33 + 2*Gt323*gt33L*gtu33 + gt23L*Xtn3) + 
+      gtu11*(2*Gt212*Gt213*gt23L + 4*Gt113*gt13L*Gt313 + 4*Gt213*gt23L*Gt313 
+      + 2*Gt113*Gt311*gt33L + 2*Gt213*Gt312*gt33L - khalf*PDstandardNth11gt33 
+      + gt11L*SQR(Gt113)) + 2*(Gt111*Gt113*gt13L*gtu11 + 
+      Gt113*gt12L*Gt213*gtu11 + Gt112*gt13L*Gt213*gtu11 + 
+      Gt113*Gt211*gt23L*gtu11 + Gt113*gt11L*Gt123*gtu21 + 
+      Gt112*Gt113*gt13L*gtu21 + Gt111*Gt123*gt13L*gtu21 + 
+      Gt123*gt12L*Gt213*gtu21 + Gt122*gt13L*Gt213*gtu21 + 
+      Gt113*gt12L*Gt223*gtu21 + Gt112*gt13L*Gt223*gtu21 + 
+      Gt213*Gt223*gt22L*gtu21 + Gt123*Gt211*gt23L*gtu21 + 
+      Gt113*Gt212*gt23L*gtu21 + Gt213*Gt222*gt23L*gtu21 + 
+      Gt113*Gt312*gt33L*gtu21 + Gt223*Gt312*gt33L*gtu21 + 
+      Gt112*Gt123*gt13L*gtu22 + Gt123*gt12L*Gt223*gtu22 + 
+      Gt122*gt13L*Gt223*gtu22 + Gt123*Gt212*gt23L*gtu22 + 
+      Gt222*Gt223*gt23L*gtu22 + Gt223*Gt322*gt33L*gtu22 + 
+      Gt113*gt11L*Gt133*gtu31 + Gt111*Gt133*gt13L*gtu31 + 
+      gt12L*Gt133*Gt213*gtu31 + Gt123*gt13L*Gt213*gtu31 + 
+      Gt113*gt12L*Gt233*gtu31 + Gt112*gt13L*Gt233*gtu31 + 
+      Gt213*gt22L*Gt233*gtu31 + Gt133*Gt211*gt23L*gtu31 + 
+      Gt113*Gt213*gt23L*gtu31 + Gt213*Gt223*gt23L*gtu31 + 
+      Gt212*Gt233*gt23L*gtu31 + Gt113*Gt313*gt33L*gtu31 + 
+      Gt213*Gt323*gt33L*gtu31 + gt11L*Gt123*Gt133*gtu32 + 
+      Gt113*Gt123*gt13L*gtu32 + Gt112*Gt133*gt13L*gtu32 + 
+      gt12L*Gt133*Gt223*gtu32 + Gt123*gt13L*Gt223*gtu32 + 
+      Gt123*gt12L*Gt233*gtu32 + Gt122*gt13L*Gt233*gtu32 + 
+      Gt223*gt22L*Gt233*gtu32 + Gt133*Gt212*gt23L*gtu32 + 
+      Gt123*Gt213*gt23L*gtu32 + Gt222*Gt233*gt23L*gtu32 + 
+      Gt233*Gt322*gt33L*gtu32 + Gt223*Gt323*gt33L*gtu32 + 
+      Gt113*Gt133*gt13L*gtu33 + gt12L*Gt133*Gt233*gtu33 + 
+      Gt123*gt13L*Gt233*gtu33 + Gt133*Gt213*gt23L*gtu33 + 
+      Gt223*Gt233*gt23L*gtu33 + gt13L*gtu31*SQR(Gt113)) + 
+      gt11L*gtu22*SQR(Gt123) + gt11L*gtu33*SQR(Gt133) + 
+      gt22L*gtu11*SQR(Gt213) + gt22L*gtu22*SQR(Gt223) + 
+      2*gt23L*gtu32*SQR(Gt223) + gt22L*gtu33*SQR(Gt233) + 
+      3*gt33L*gtu11*SQR(Gt313) + 3*gt33L*gtu22*SQR(Gt323) + 
+      3*gt33L*gtu33*SQR(Gt333);
+    
+    CCTK_REAL fac1 = IfThen(conformalMethod,-(khalf*INV(phiL)),1);
+    
+    CCTK_REAL cdphi1 = fac1*PDstandardNth1phi;
+    
+    CCTK_REAL cdphi2 = fac1*PDstandardNth2phi;
+    
+    CCTK_REAL cdphi3 = fac1*PDstandardNth3phi;
+    
+    CCTK_REAL fac2 = IfThen(conformalMethod,khalf*pow(phiL,-2),0);
+    
+    CCTK_REAL cdphi211 = -(fac1*(-PDstandardNth11phi + 
       Gt111*PDstandardNth1phi + Gt211*PDstandardNth2phi + 
       Gt311*PDstandardNth3phi)) + fac2*SQR(PDstandardNth1phi);
     
-    CCTK_REAL_VEC cdphi212 = fac2*PDstandardNth1phi*PDstandardNth2phi - 
+    CCTK_REAL cdphi212 = fac2*PDstandardNth1phi*PDstandardNth2phi - 
       fac1*(-PDstandardNth12phi + Gt112*PDstandardNth1phi + 
       Gt212*PDstandardNth2phi + Gt312*PDstandardNth3phi);
     
-    CCTK_REAL_VEC cdphi213 = fac2*PDstandardNth1phi*PDstandardNth3phi - 
+    CCTK_REAL cdphi213 = fac2*PDstandardNth1phi*PDstandardNth3phi - 
       fac1*(-PDstandardNth13phi + Gt113*PDstandardNth1phi + 
       Gt213*PDstandardNth2phi + Gt313*PDstandardNth3phi);
     
-    CCTK_REAL_VEC cdphi222 = -(fac1*(Gt122*PDstandardNth1phi - 
+    CCTK_REAL cdphi222 = -(fac1*(Gt122*PDstandardNth1phi - 
       PDstandardNth22phi + Gt222*PDstandardNth2phi + 
       Gt322*PDstandardNth3phi)) + fac2*SQR(PDstandardNth2phi);
     
-    CCTK_REAL_VEC cdphi223 = fac2*PDstandardNth2phi*PDstandardNth3phi - 
+    CCTK_REAL cdphi223 = fac2*PDstandardNth2phi*PDstandardNth3phi - 
       fac1*(Gt123*PDstandardNth1phi - PDstandardNth23phi + 
       Gt223*PDstandardNth2phi + Gt323*PDstandardNth3phi);
     
-    CCTK_REAL_VEC cdphi233 = -(fac1*(Gt133*PDstandardNth1phi + 
+    CCTK_REAL cdphi233 = -(fac1*(Gt133*PDstandardNth1phi + 
       Gt233*PDstandardNth2phi - PDstandardNth33phi + 
       Gt333*PDstandardNth3phi)) + fac2*SQR(PDstandardNth3phi);
     
-    CCTK_REAL_VEC Rphi11 = -2*(cdphi211 + 2*(-1 + gt11L*gtu11)*SQR(cdphi1) 
-      + gt11L*(cdphi211*gtu11 + 4*(cdphi1*(cdphi2*gtu21 + cdphi3*gtu31) + 
+    CCTK_REAL Rphi11 = -2*(cdphi211 + 2*(-1 + gt11L*gtu11)*SQR(cdphi1) + 
+      gt11L*(cdphi211*gtu11 + 4*(cdphi1*(cdphi2*gtu21 + cdphi3*gtu31) + 
       cdphi2*cdphi3*gtu32) + cdphi233*gtu33 + gtu22*(cdphi222 + 
       2*SQR(cdphi2)) + 2*(cdphi212*gtu21 + cdphi213*gtu31 + cdphi223*gtu32 + 
       gtu33*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi12 = -2*(cdphi212 + cdphi1*(cdphi2*(-2 + 
-      4*gt12L*gtu21) + 4*cdphi3*gt12L*gtu31) + gt12L*(cdphi211*gtu11 + 
-      4*cdphi2*cdphi3*gtu32 + 2*(cdphi212*gtu21 + cdphi213*gtu31 + 
-      cdphi223*gtu32 + gtu11*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2)) 
-      + gtu33*(cdphi233 + 2*SQR(cdphi3))));
+    CCTK_REAL Rphi12 = -2*(cdphi212 + cdphi1*(cdphi2*(-2 + 4*gt12L*gtu21) 
+      + 4*cdphi3*gt12L*gtu31) + gt12L*(cdphi211*gtu11 + 4*cdphi2*cdphi3*gtu32 
+      + 2*(cdphi212*gtu21 + cdphi213*gtu31 + cdphi223*gtu32 + 
+      gtu11*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2)) + gtu33*(cdphi233 
+      + 2*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi13 = -2*(cdphi213 + cdphi1*(4*cdphi2*gt13L*gtu21 + 
+    CCTK_REAL Rphi13 = -2*(cdphi213 + cdphi1*(4*cdphi2*gt13L*gtu21 + 
       cdphi3*(-2 + 4*gt13L*gtu31)) + gt13L*(cdphi211*gtu11 + 
       4*cdphi2*cdphi3*gtu32 + 2*(cdphi212*gtu21 + cdphi213*gtu31 + 
       cdphi223*gtu32 + gtu11*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2)) 
       + gtu33*(cdphi233 + 2*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi22 = -2*(cdphi222 + 2*(-1 + gt22L*gtu22)*SQR(cdphi2) 
-      + gt22L*(cdphi222*gtu22 + 4*(cdphi1*cdphi3*gtu31 + cdphi2*(cdphi1*gtu21 
-      + cdphi3*gtu32)) + cdphi233*gtu33 + gtu11*(cdphi211 + 2*SQR(cdphi1)) + 
+    CCTK_REAL Rphi22 = -2*(cdphi222 + 2*(-1 + gt22L*gtu22)*SQR(cdphi2) + 
+      gt22L*(cdphi222*gtu22 + 4*(cdphi1*cdphi3*gtu31 + cdphi2*(cdphi1*gtu21 + 
+      cdphi3*gtu32)) + cdphi233*gtu33 + gtu11*(cdphi211 + 2*SQR(cdphi1)) + 
       2*(cdphi212*gtu21 + cdphi213*gtu31 + cdphi223*gtu32 + 
       gtu33*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi23 = -2*(cdphi223 + cdphi2*(4*cdphi1*gt23L*gtu21 + 
+    CCTK_REAL Rphi23 = -2*(cdphi223 + cdphi2*(4*cdphi1*gt23L*gtu21 + 
       cdphi3*(-2 + 4*gt23L*gtu32)) + gt23L*(cdphi222*gtu22 + 
       4*cdphi1*cdphi3*gtu31 + gtu11*(cdphi211 + 2*SQR(cdphi1)) + 
       2*(cdphi212*gtu21 + cdphi213*gtu31 + cdphi223*gtu32 + 
       gtu22*SQR(cdphi2)) + gtu33*(cdphi233 + 2*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi33 = -2*(cdphi233 + gt33L*((4*cdphi1*cdphi2 + 
+    CCTK_REAL Rphi33 = -2*(cdphi233 + gt33L*((4*cdphi1*cdphi2 + 
       2*cdphi212)*gtu21 + 4*cdphi3*(cdphi1*gtu31 + cdphi2*gtu32) + 
       2*(cdphi213*gtu31 + cdphi223*gtu32) + cdphi233*gtu33 + gtu11*(cdphi211 
       + 2*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2))) + 2*(-1 + 
       gt33L*gtu33)*SQR(cdphi3));
     
-    CCTK_REAL_VEC Atm11 = At11L*gtu11 + At12L*gtu21 + At13L*gtu31;
+    CCTK_REAL Atm11 = At11L*gtu11 + At12L*gtu21 + At13L*gtu31;
     
-    CCTK_REAL_VEC Atm21 = At11L*gtu21 + At12L*gtu22 + At13L*gtu32;
+    CCTK_REAL Atm21 = At11L*gtu21 + At12L*gtu22 + At13L*gtu32;
     
-    CCTK_REAL_VEC Atm31 = At11L*gtu31 + At12L*gtu32 + At13L*gtu33;
+    CCTK_REAL Atm31 = At11L*gtu31 + At12L*gtu32 + At13L*gtu33;
     
-    CCTK_REAL_VEC Atm12 = At12L*gtu11 + At22L*gtu21 + At23L*gtu31;
+    CCTK_REAL Atm12 = At12L*gtu11 + At22L*gtu21 + At23L*gtu31;
     
-    CCTK_REAL_VEC Atm22 = At12L*gtu21 + At22L*gtu22 + At23L*gtu32;
+    CCTK_REAL Atm22 = At12L*gtu21 + At22L*gtu22 + At23L*gtu32;
     
-    CCTK_REAL_VEC Atm32 = At12L*gtu31 + At22L*gtu32 + At23L*gtu33;
+    CCTK_REAL Atm32 = At12L*gtu31 + At22L*gtu32 + At23L*gtu33;
     
-    CCTK_REAL_VEC Atm13 = At13L*gtu11 + At23L*gtu21 + At33L*gtu31;
+    CCTK_REAL Atm13 = At13L*gtu11 + At23L*gtu21 + At33L*gtu31;
     
-    CCTK_REAL_VEC Atm23 = At13L*gtu21 + At23L*gtu22 + At33L*gtu32;
+    CCTK_REAL Atm23 = At13L*gtu21 + At23L*gtu22 + At33L*gtu32;
     
-    CCTK_REAL_VEC Atm33 = At13L*gtu31 + At23L*gtu32 + At33L*gtu33;
+    CCTK_REAL Atm33 = At13L*gtu31 + At23L*gtu32 + At33L*gtu33;
     
-    CCTK_REAL_VEC e4phi = 
-      IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
+    CCTK_REAL e4phi = IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
     
-    CCTK_REAL_VEC em4phi = INV(e4phi);
+    CCTK_REAL em4phi = INV(e4phi);
     
-    CCTK_REAL_VEC g11 = e4phi*gt11L;
+    CCTK_REAL g11 = e4phi*gt11L;
     
-    CCTK_REAL_VEC g12 = e4phi*gt12L;
+    CCTK_REAL g12 = e4phi*gt12L;
     
-    CCTK_REAL_VEC g13 = e4phi*gt13L;
+    CCTK_REAL g13 = e4phi*gt13L;
     
-    CCTK_REAL_VEC g22 = e4phi*gt22L;
+    CCTK_REAL g22 = e4phi*gt22L;
     
-    CCTK_REAL_VEC g23 = e4phi*gt23L;
+    CCTK_REAL g23 = e4phi*gt23L;
     
-    CCTK_REAL_VEC g33 = e4phi*gt33L;
+    CCTK_REAL g33 = e4phi*gt33L;
     
-    CCTK_REAL_VEC gu11 = em4phi*gtu11;
+    CCTK_REAL gu11 = em4phi*gtu11;
     
-    CCTK_REAL_VEC gu21 = em4phi*gtu21;
+    CCTK_REAL gu21 = em4phi*gtu21;
     
-    CCTK_REAL_VEC gu31 = em4phi*gtu31;
+    CCTK_REAL gu31 = em4phi*gtu31;
     
-    CCTK_REAL_VEC gu22 = em4phi*gtu22;
+    CCTK_REAL gu22 = em4phi*gtu22;
     
-    CCTK_REAL_VEC gu32 = em4phi*gtu32;
+    CCTK_REAL gu32 = em4phi*gtu32;
     
-    CCTK_REAL_VEC gu33 = em4phi*gtu33;
+    CCTK_REAL gu33 = em4phi*gtu33;
     
-    CCTK_REAL_VEC R11 = Rphi11 + Rt11;
+    CCTK_REAL R11 = Rphi11 + Rt11;
     
-    CCTK_REAL_VEC R12 = Rphi12 + Rt12;
+    CCTK_REAL R12 = Rphi12 + Rt12;
     
-    CCTK_REAL_VEC R13 = Rphi13 + Rt13;
+    CCTK_REAL R13 = Rphi13 + Rt13;
     
-    CCTK_REAL_VEC R22 = Rphi22 + Rt22;
+    CCTK_REAL R22 = Rphi22 + Rt22;
     
-    CCTK_REAL_VEC R23 = Rphi23 + Rt23;
+    CCTK_REAL R23 = Rphi23 + Rt23;
     
-    CCTK_REAL_VEC R33 = Rphi33 + Rt33;
+    CCTK_REAL R33 = Rphi33 + Rt33;
     
-    CCTK_REAL_VEC trS = em4phi*(eTxxL*gtu11 + eTyyL*gtu22 + 2*(eTxyL*gtu21 
-      + eTxzL*gtu31 + eTyzL*gtu32) + eTzzL*gtu33);
+    CCTK_REAL trS = em4phi*(eTxxL*gtu11 + eTyyL*gtu22 + 2*(eTxyL*gtu21 + 
+      eTxzL*gtu31 + eTyzL*gtu32) + eTzzL*gtu33);
     
-    CCTK_REAL_VEC Ats11 = -PDstandardNth11alpha + (4*cdphi1 + 
+    CCTK_REAL Ats11 = -PDstandardNth11alpha + (4*cdphi1 + 
       Gt111)*PDstandardNth1alpha + Gt211*PDstandardNth2alpha + 
       Gt311*PDstandardNth3alpha + alphaL*R11;
     
-    CCTK_REAL_VEC Ats12 = -PDstandardNth12alpha + (2*cdphi2 + 
+    CCTK_REAL Ats12 = -PDstandardNth12alpha + (2*cdphi2 + 
       Gt112)*PDstandardNth1alpha + (2*cdphi1 + Gt212)*PDstandardNth2alpha + 
       Gt312*PDstandardNth3alpha + alphaL*R12;
     
-    CCTK_REAL_VEC Ats13 = -PDstandardNth13alpha + (2*cdphi3 + 
+    CCTK_REAL Ats13 = -PDstandardNth13alpha + (2*cdphi3 + 
       Gt113)*PDstandardNth1alpha + Gt213*PDstandardNth2alpha + (2*cdphi1 + 
       Gt313)*PDstandardNth3alpha + alphaL*R13;
     
-    CCTK_REAL_VEC Ats22 = Gt122*PDstandardNth1alpha - PDstandardNth22alpha 
-      + (4*cdphi2 + Gt222)*PDstandardNth2alpha + Gt322*PDstandardNth3alpha + 
+    CCTK_REAL Ats22 = Gt122*PDstandardNth1alpha - PDstandardNth22alpha + 
+      (4*cdphi2 + Gt222)*PDstandardNth2alpha + Gt322*PDstandardNth3alpha + 
       alphaL*R22;
     
-    CCTK_REAL_VEC Ats23 = Gt123*PDstandardNth1alpha - PDstandardNth23alpha 
-      + (2*cdphi3 + Gt223)*PDstandardNth2alpha + (2*cdphi2 + 
+    CCTK_REAL Ats23 = Gt123*PDstandardNth1alpha - PDstandardNth23alpha + 
+      (2*cdphi3 + Gt223)*PDstandardNth2alpha + (2*cdphi2 + 
       Gt323)*PDstandardNth3alpha + alphaL*R23;
     
-    CCTK_REAL_VEC Ats33 = Gt133*PDstandardNth1alpha + 
+    CCTK_REAL Ats33 = Gt133*PDstandardNth1alpha + 
       Gt233*PDstandardNth2alpha - PDstandardNth33alpha + (4*cdphi3 + 
       Gt333)*PDstandardNth3alpha + alphaL*R33;
     
-    CCTK_REAL_VEC trAts = Ats11*gu11 + Ats22*gu22 + 2*(Ats12*gu21 + 
-      Ats13*gu31 + Ats23*gu32) + Ats33*gu33;
+    CCTK_REAL trAts = Ats11*gu11 + Ats22*gu22 + 2*(Ats12*gu21 + Ats13*gu31 
+      + Ats23*gu32) + Ats33*gu33;
     
-    CCTK_REAL_VEC At11rhsL = -2.*alphaL*(At11L*Atm11 + At12L*Atm21 + 
+    CCTK_REAL At11rhsL = -2.*alphaL*(At11L*Atm11 + At12L*Atm21 + 
       At13L*Atm31) + epsdiss1*PDdissipationNth1At11 + 
       epsdiss2*PDdissipationNth2At11 + epsdiss3*PDdissipationNth3At11 + 
       2.*(At12L*PDstandardNth1beta2 + At13L*PDstandardNth1beta3) + 
@@ -1080,7 +1078,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       PDupwindNthSymm1At11*Abs(beta1L) + PDupwindNthSymm2At11*Abs(beta2L) + 
       PDupwindNthSymm3At11*Abs(beta3L);
     
-    CCTK_REAL_VEC At12rhsL = -2.*alphaL*(At11L*Atm12 + At12L*Atm22 + 
+    CCTK_REAL At12rhsL = -2.*alphaL*(At11L*Atm12 + At12L*Atm22 + 
       At13L*Atm32) + epsdiss1*PDdissipationNth1At12 + 
       epsdiss2*PDdissipationNth2At12 + epsdiss3*PDdissipationNth3At12 + 
       At22L*PDstandardNth1beta2 + At23L*PDstandardNth1beta3 + 
@@ -1097,7 +1095,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       PDupwindNthSymm1At12*Abs(beta1L) + PDupwindNthSymm2At12*Abs(beta2L) + 
       PDupwindNthSymm3At12*Abs(beta3L);
     
-    CCTK_REAL_VEC At13rhsL = -2.*alphaL*(At11L*Atm13 + At12L*Atm23 + 
+    CCTK_REAL At13rhsL = -2.*alphaL*(At11L*Atm13 + At12L*Atm23 + 
       At13L*Atm33) + epsdiss1*PDdissipationNth1At13 + 
       epsdiss2*PDdissipationNth2At13 + epsdiss3*PDdissipationNth3At13 + 
       At23L*PDstandardNth1beta2 + At33L*PDstandardNth1beta3 + 
@@ -1113,7 +1111,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       PDupwindNthSymm1At13*Abs(beta1L) + PDupwindNthSymm2At13*Abs(beta2L) + 
       PDupwindNthSymm3At13*Abs(beta3L);
     
-    CCTK_REAL_VEC At22rhsL = -2.*alphaL*(At12L*Atm12 + At22L*Atm22 + 
+    CCTK_REAL At22rhsL = -2.*alphaL*(At12L*Atm12 + At22L*Atm22 + 
       At23L*Atm32) + epsdiss1*PDdissipationNth1At22 + 
       epsdiss2*PDdissipationNth2At22 + epsdiss3*PDdissipationNth3At22 + 
       2.*(At12L*PDstandardNth2beta1 + At23L*PDstandardNth2beta3) + 
@@ -1128,7 +1126,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       PDupwindNthSymm1At22*Abs(beta1L) + PDupwindNthSymm2At22*Abs(beta2L) + 
       PDupwindNthSymm3At22*Abs(beta3L);
     
-    CCTK_REAL_VEC At23rhsL = -2.*alphaL*(At12L*Atm13 + At22L*Atm23 + 
+    CCTK_REAL At23rhsL = -2.*alphaL*(At12L*Atm13 + At22L*Atm23 + 
       At23L*Atm33) + epsdiss1*PDdissipationNth1At23 + 
       epsdiss2*PDdissipationNth2At23 + epsdiss3*PDdissipationNth3At23 + 
       At13L*PDstandardNth2beta1 + At33L*PDstandardNth2beta3 + 
@@ -1144,7 +1142,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
       PDupwindNthSymm1At23*Abs(beta1L) + PDupwindNthSymm2At23*Abs(beta2L) + 
       PDupwindNthSymm3At23*Abs(beta3L);
     
-    CCTK_REAL_VEC At33rhsL = -2.*alphaL*(At13L*Atm13 + At23L*Atm23 + 
+    CCTK_REAL At33rhsL = -2.*alphaL*(At13L*Atm13 + At23L*Atm23 + 
       At33L*Atm33) + epsdiss1*PDdissipationNth1At33 + 
       epsdiss2*PDdissipationNth2At33 + epsdiss3*PDdissipationNth3At33 + 
       2.*(At13L*PDstandardNth3beta1 + At23L*PDstandardNth3beta2) + 
@@ -1162,18 +1160,17 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(At11rhs[index],At11rhsL);
-    vec_store_nta(At12rhs[index],At12rhsL);
-    vec_store_nta(At13rhs[index],At13rhsL);
-    vec_store_nta(At22rhs[index],At22rhsL);
-    vec_store_nta(At23rhs[index],At23rhsL);
-    vec_store_nta(At33rhs[index],At33rhsL);
-  i += CCTK_REAL_VEC_SIZE-1;
+    At11rhs[index] = At11rhsL;
+    At12rhs[index] = At12rhsL;
+    At13rhs[index] = At13rhsL;
+    At22rhs[index] = At22rhsL;
+    At23rhs[index] = At23rhsL;
+    At33rhs[index] = At33rhsL;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_RHS2);
 }
 
-extern "C" void ML_BSSN_O8_RHS2(CCTK_ARGUMENTS)
+void ML_BSSN_O8_RHS2(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_RHSRadiativeBoundary.c b/ML_BSSN_O8/src/ML_BSSN_O8_RHSRadiativeBoundary.c
new file mode 100644
index 0000000..008c907
--- /dev/null
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_RHSRadiativeBoundary.c
@@ -0,0 +1,301 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "cctk.h"
+#include "cctk_Arguments.h"
+#include "cctk_Parameters.h"
+#include "GenericFD.h"
+#include "Differencing.h"
+#include "loopcontrol.h"
+
+/* Define macros used in calculations */
+#define INITVALUE  (42)
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+#define QAD(x) ((x) * (x) * (x) * (x))
+
+void ML_BSSN_O8_RHSRadiativeBoundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  
+  /* Declare finite differencing variables */
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_O8_RHSRadiativeBoundary_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_O8_RHSRadiativeBoundary_calc_every != ML_BSSN_O8_RHSRadiativeBoundary_calc_offset)
+  {
+    return;
+  }
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
+  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
+  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
+  int const di = 1;
+  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  CCTK_REAL const dxi = 1.0 / dx;
+  CCTK_REAL const dyi = 1.0 / dy;
+  CCTK_REAL const dzi = 1.0 / dz;
+  CCTK_REAL const khalf = 0.5;
+  CCTK_REAL const kthird = 1/3.0;
+  CCTK_REAL const ktwothird = 2.0/3.0;
+  CCTK_REAL const kfourthird = 4.0/3.0;
+  CCTK_REAL const keightthird = 8.0/3.0;
+  CCTK_REAL const hdxi = 0.5 * dxi;
+  CCTK_REAL const hdyi = 0.5 * dyi;
+  CCTK_REAL const hdzi = 0.5 * dzi;
+  
+  /* Initialize predefined quantities */
+  CCTK_REAL const p1o1024dx = INV(dx)/1024.;
+  CCTK_REAL const p1o1024dy = INV(dy)/1024.;
+  CCTK_REAL const p1o1024dz = INV(dz)/1024.;
+  CCTK_REAL const p1o1680dx = INV(dx)/1680.;
+  CCTK_REAL const p1o1680dy = INV(dy)/1680.;
+  CCTK_REAL const p1o1680dz = INV(dz)/1680.;
+  CCTK_REAL const p1o5040dx2 = pow(dx,-2)/5040.;
+  CCTK_REAL const p1o5040dy2 = pow(dy,-2)/5040.;
+  CCTK_REAL const p1o5040dz2 = pow(dz,-2)/5040.;
+  CCTK_REAL const p1o560dx = INV(dx)/560.;
+  CCTK_REAL const p1o560dy = INV(dy)/560.;
+  CCTK_REAL const p1o560dz = INV(dz)/560.;
+  CCTK_REAL const p1o705600dxdy = (INV(dx)*INV(dy))/705600.;
+  CCTK_REAL const p1o705600dxdz = (INV(dx)*INV(dz))/705600.;
+  CCTK_REAL const p1o705600dydz = (INV(dy)*INV(dz))/705600.;
+  CCTK_REAL const p1o840dx = INV(dx)/840.;
+  CCTK_REAL const p1o840dy = INV(dy)/840.;
+  CCTK_REAL const p1o840dz = INV(dz)/840.;
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o840dx = -INV(dx)/840.;
+  CCTK_REAL const pm1o840dy = -INV(dy)/840.;
+  CCTK_REAL const pm1o840dz = -INV(dz)/840.;
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_O8_RHSRadiativeBoundary,
+            i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    // int index = INITVALUE;
+    int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
+    /* Declare derivatives */
+    
+    /* Assign local copies of grid functions */
+    CCTK_REAL  AL = A[index];
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  At11L = At11[index];
+    CCTK_REAL  At12L = At12[index];
+    CCTK_REAL  At13L = At13[index];
+    CCTK_REAL  At22L = At22[index];
+    CCTK_REAL  At23L = At23[index];
+    CCTK_REAL  At33L = At33[index];
+    CCTK_REAL  B1L = B1[index];
+    CCTK_REAL  B2L = B2[index];
+    CCTK_REAL  B3L = B3[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  gt11L = gt11[index];
+    CCTK_REAL  gt12L = gt12[index];
+    CCTK_REAL  gt13L = gt13[index];
+    CCTK_REAL  gt22L = gt22[index];
+    CCTK_REAL  gt23L = gt23[index];
+    CCTK_REAL  gt33L = gt33[index];
+    CCTK_REAL  phiL = phi[index];
+    CCTK_REAL  trKL = trK[index];
+    CCTK_REAL  Xt1L = Xt1[index];
+    CCTK_REAL  Xt2L = Xt2[index];
+    CCTK_REAL  Xt3L = Xt3[index];
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    
+    /* Calculate temporaries and grid functions */
+    int dir1 = Sign(normal[0]);
+    
+    int dir2 = Sign(normal[1]);
+    
+    int dir3 = Sign(normal[2]);
+    
+    CCTK_REAL detgt = 1;
+    
+    CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
+    
+    CCTK_REAL gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
+    
+    CCTK_REAL gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
+    
+    CCTK_REAL gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
+    
+    CCTK_REAL gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
+    
+    CCTK_REAL gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
+    
+    CCTK_REAL em4phi = IfThen(conformalMethod,SQR(phiL),exp(-4*phiL));
+    
+    CCTK_REAL gu11 = em4phi*gtu11;
+    
+    CCTK_REAL gu21 = em4phi*gtu21;
+    
+    CCTK_REAL gu31 = em4phi*gtu31;
+    
+    CCTK_REAL gu22 = em4phi*gtu22;
+    
+    CCTK_REAL gu32 = em4phi*gtu32;
+    
+    CCTK_REAL gu33 = em4phi*gtu33;
+    
+    CCTK_REAL nn1 = normal[0];
+    
+    CCTK_REAL nn2 = normal[1];
+    
+    CCTK_REAL nn3 = normal[2];
+    
+    CCTK_REAL nu1 = gu11*nn1 + gu21*nn2 + gu31*nn3;
+    
+    CCTK_REAL nu2 = gu21*nn1 + gu22*nn2 + gu32*nn3;
+    
+    CCTK_REAL nu3 = gu31*nn1 + gu32*nn2 + gu33*nn3;
+    
+    CCTK_REAL nlen2 = nn1*nu1 + nn2*nu2 + nn3*nu3;
+    
+    CCTK_REAL nlen = pow(nlen2,0.5);
+    
+    CCTK_REAL su1 = nu1*INV(nlen);
+    
+    CCTK_REAL su2 = nu2*INV(nlen);
+    
+    CCTK_REAL su3 = nu3*INV(nlen);
+    
+    CCTK_REAL vg = pow(harmonicF,0.5);
+    
+    CCTK_REAL phirhsL = -((PDonesided1(phi, i, j, k)*su1 + 
+      PDonesided2(phi, i, j, k)*su2 + PDonesided3(phi, i, j, k)*su3)*vg);
+    
+    CCTK_REAL gt11rhsL = -(PDonesided1(gt11, i, j, k)*su1) - 
+      PDonesided2(gt11, i, j, k)*su2 - PDonesided3(gt11, i, j, k)*su3;
+    
+    CCTK_REAL gt12rhsL = -(PDonesided1(gt12, i, j, k)*su1) - 
+      PDonesided2(gt12, i, j, k)*su2 - PDonesided3(gt12, i, j, k)*su3;
+    
+    CCTK_REAL gt13rhsL = -(PDonesided1(gt13, i, j, k)*su1) - 
+      PDonesided2(gt13, i, j, k)*su2 - PDonesided3(gt13, i, j, k)*su3;
+    
+    CCTK_REAL gt22rhsL = -(PDonesided1(gt22, i, j, k)*su1) - 
+      PDonesided2(gt22, i, j, k)*su2 - PDonesided3(gt22, i, j, k)*su3;
+    
+    CCTK_REAL gt23rhsL = -(PDonesided1(gt23, i, j, k)*su1) - 
+      PDonesided2(gt23, i, j, k)*su2 - PDonesided3(gt23, i, j, k)*su3;
+    
+    CCTK_REAL gt33rhsL = -(PDonesided1(gt33, i, j, k)*su1) - 
+      PDonesided2(gt33, i, j, k)*su2 - PDonesided3(gt33, i, j, k)*su3;
+    
+    CCTK_REAL trKrhsL = -((PDonesided1(trK, i, j, k)*su1 + 
+      PDonesided2(trK, i, j, k)*su2 + PDonesided3(trK, i, j, k)*su3)*vg);
+    
+    CCTK_REAL At11rhsL = -(PDonesided1(At11, i, j, k)*su1) - 
+      PDonesided2(At11, i, j, k)*su2 - PDonesided3(At11, i, j, k)*su3;
+    
+    CCTK_REAL At12rhsL = -(PDonesided1(At12, i, j, k)*su1) - 
+      PDonesided2(At12, i, j, k)*su2 - PDonesided3(At12, i, j, k)*su3;
+    
+    CCTK_REAL At13rhsL = -(PDonesided1(At13, i, j, k)*su1) - 
+      PDonesided2(At13, i, j, k)*su2 - PDonesided3(At13, i, j, k)*su3;
+    
+    CCTK_REAL At22rhsL = -(PDonesided1(At22, i, j, k)*su1) - 
+      PDonesided2(At22, i, j, k)*su2 - PDonesided3(At22, i, j, k)*su3;
+    
+    CCTK_REAL At23rhsL = -(PDonesided1(At23, i, j, k)*su1) - 
+      PDonesided2(At23, i, j, k)*su2 - PDonesided3(At23, i, j, k)*su3;
+    
+    CCTK_REAL At33rhsL = -(PDonesided1(At33, i, j, k)*su1) - 
+      PDonesided2(At33, i, j, k)*su2 - PDonesided3(At33, i, j, k)*su3;
+    
+    CCTK_REAL Xt1rhsL = -(PDonesided1(Xt1, i, j, k)*su1) - 
+      PDonesided2(Xt1, i, j, k)*su2 - PDonesided3(Xt1, i, j, k)*su3;
+    
+    CCTK_REAL Xt2rhsL = -(PDonesided1(Xt2, i, j, k)*su1) - 
+      PDonesided2(Xt2, i, j, k)*su2 - PDonesided3(Xt2, i, j, k)*su3;
+    
+    CCTK_REAL Xt3rhsL = -(PDonesided1(Xt3, i, j, k)*su1) - 
+      PDonesided2(Xt3, i, j, k)*su2 - PDonesided3(Xt3, i, j, k)*su3;
+    
+    CCTK_REAL alpharhsL = -((PDonesided1(alpha, i, j, k)*su1 + 
+      PDonesided2(alpha, i, j, k)*su2 + PDonesided3(alpha, i, j, 
+      k)*su3)*vg);
+    
+    CCTK_REAL ArhsL = -((PDonesided1(A, i, j, k)*su1 + PDonesided2(A, 
+      i, j, k)*su2 + PDonesided3(A, i, j, k)*su3)*vg);
+    
+    CCTK_REAL beta1rhsL = -(PDonesided1(beta1, i, j, k)*su1) - 
+      PDonesided2(beta1, i, j, k)*su2 - PDonesided3(beta1, i, j, k)*su3;
+    
+    CCTK_REAL beta2rhsL = -(PDonesided1(beta2, i, j, k)*su1) - 
+      PDonesided2(beta2, i, j, k)*su2 - PDonesided3(beta2, i, j, k)*su3;
+    
+    CCTK_REAL beta3rhsL = -(PDonesided1(beta3, i, j, k)*su1) - 
+      PDonesided2(beta3, i, j, k)*su2 - PDonesided3(beta3, i, j, k)*su3;
+    
+    CCTK_REAL B1rhsL = -(PDonesided1(B1, i, j, k)*su1) - 
+      PDonesided2(B1, i, j, k)*su2 - PDonesided3(B1, i, j, k)*su3;
+    
+    CCTK_REAL B2rhsL = -(PDonesided1(B2, i, j, k)*su1) - 
+      PDonesided2(B2, i, j, k)*su2 - PDonesided3(B2, i, j, k)*su3;
+    
+    CCTK_REAL B3rhsL = -(PDonesided1(B3, i, j, k)*su1) - 
+      PDonesided2(B3, i, j, k)*su2 - PDonesided3(B3, i, j, k)*su3;
+    
+    
+    /* Copy local copies back to grid functions */
+    alpharhs[index] = alpharhsL;
+    Arhs[index] = ArhsL;
+    At11rhs[index] = At11rhsL;
+    At12rhs[index] = At12rhsL;
+    At13rhs[index] = At13rhsL;
+    At22rhs[index] = At22rhsL;
+    At23rhs[index] = At23rhsL;
+    At33rhs[index] = At33rhsL;
+    B1rhs[index] = B1rhsL;
+    B2rhs[index] = B2rhsL;
+    B3rhs[index] = B3rhsL;
+    beta1rhs[index] = beta1rhsL;
+    beta2rhs[index] = beta2rhsL;
+    beta3rhs[index] = beta3rhsL;
+    gt11rhs[index] = gt11rhsL;
+    gt12rhs[index] = gt12rhsL;
+    gt13rhs[index] = gt13rhsL;
+    gt22rhs[index] = gt22rhsL;
+    gt23rhs[index] = gt23rhsL;
+    gt33rhs[index] = gt33rhsL;
+    phirhs[index] = phirhsL;
+    trKrhs[index] = trKrhsL;
+    Xt1rhs[index] = Xt1rhsL;
+    Xt2rhs[index] = Xt2rhsL;
+    Xt3rhs[index] = Xt3rhsL;
+  }
+  LC_ENDLOOP3 (ML_BSSN_O8_RHSRadiativeBoundary);
+}
+
+void ML_BSSN_O8_RHSRadiativeBoundary(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverBoundary(cctkGH, &ML_BSSN_O8_RHSRadiativeBoundary_Body);
+}
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_RHSRadiativeBoundary.cc b/ML_BSSN_O8/src/ML_BSSN_O8_RHSRadiativeBoundary.cc
deleted file mode 100644
index 6e55a35..0000000
--- a/ML_BSSN_O8/src/ML_BSSN_O8_RHSRadiativeBoundary.cc
+++ /dev/null
@@ -1,303 +0,0 @@
-/*  File produced by Kranc */
-
-#define KRANC_C
-
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
-#include "GenericFD.h"
-#include "Differencing.h"
-#include "Vectors.hh"
-#include "loopcontrol.h"
-
-/* Define macros used in calculations */
-#define INITVALUE  (42)
-#define INV(x) ((1.0) / (x))
-#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
-#define QAD(x) ((x) * (x) * (x) * (x))
-
-static void ML_BSSN_O8_RHSRadiativeBoundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  
-  /* Declare finite differencing variables */
-  
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_O8_RHSRadiativeBoundary_Body");
-  }
-  
-  if (cctk_iteration % ML_BSSN_O8_RHSRadiativeBoundary_calc_every != ML_BSSN_O8_RHSRadiativeBoundary_calc_offset)
-  {
-    return;
-  }
-  
-  /* Include user-supplied include files */
-  
-  /* Initialise finite differencing variables */
-  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
-  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
-  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
-  int const di = 1;
-  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  CCTK_REAL const dxi = 1.0 / dx;
-  CCTK_REAL const dyi = 1.0 / dy;
-  CCTK_REAL const dzi = 1.0 / dz;
-  CCTK_REAL const khalf = 0.5;
-  CCTK_REAL const kthird = 1/3.0;
-  CCTK_REAL const ktwothird = 2.0/3.0;
-  CCTK_REAL const kfourthird = 4.0/3.0;
-  CCTK_REAL const keightthird = 8.0/3.0;
-  CCTK_REAL const hdxi = 0.5 * dxi;
-  CCTK_REAL const hdyi = 0.5 * dyi;
-  CCTK_REAL const hdzi = 0.5 * dzi;
-  
-  /* Initialize predefined quantities */
-  CCTK_REAL const p1o1024dx = INV(dx)/1024.;
-  CCTK_REAL const p1o1024dy = INV(dy)/1024.;
-  CCTK_REAL const p1o1024dz = INV(dz)/1024.;
-  CCTK_REAL const p1o1680dx = INV(dx)/1680.;
-  CCTK_REAL const p1o1680dy = INV(dy)/1680.;
-  CCTK_REAL const p1o1680dz = INV(dz)/1680.;
-  CCTK_REAL const p1o5040dx2 = pow(dx,-2)/5040.;
-  CCTK_REAL const p1o5040dy2 = pow(dy,-2)/5040.;
-  CCTK_REAL const p1o5040dz2 = pow(dz,-2)/5040.;
-  CCTK_REAL const p1o560dx = INV(dx)/560.;
-  CCTK_REAL const p1o560dy = INV(dy)/560.;
-  CCTK_REAL const p1o560dz = INV(dz)/560.;
-  CCTK_REAL const p1o705600dxdy = (INV(dx)*INV(dy))/705600.;
-  CCTK_REAL const p1o705600dxdz = (INV(dx)*INV(dz))/705600.;
-  CCTK_REAL const p1o705600dydz = (INV(dy)*INV(dz))/705600.;
-  CCTK_REAL const p1o840dx = INV(dx)/840.;
-  CCTK_REAL const p1o840dy = INV(dy)/840.;
-  CCTK_REAL const p1o840dz = INV(dz)/840.;
-  CCTK_REAL const p1odx = INV(dx);
-  CCTK_REAL const p1ody = INV(dy);
-  CCTK_REAL const p1odz = INV(dz);
-  CCTK_REAL const pm1o840dx = -INV(dx)/840.;
-  CCTK_REAL const pm1o840dy = -INV(dy)/840.;
-  CCTK_REAL const pm1o840dz = -INV(dz)/840.;
-  
-  /* Loop over the grid points */
-  #pragma omp parallel
-  LC_LOOP3 (ML_BSSN_O8_RHSRadiativeBoundary,
-            i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
-  {
-    // int index = INITVALUE;
-    int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    /* Declare derivatives */
-    
-    /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  AL = vec_load(A[index]);
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  At11L = vec_load(At11[index]);
-    CCTK_REAL_VEC  At12L = vec_load(At12[index]);
-    CCTK_REAL_VEC  At13L = vec_load(At13[index]);
-    CCTK_REAL_VEC  At22L = vec_load(At22[index]);
-    CCTK_REAL_VEC  At23L = vec_load(At23[index]);
-    CCTK_REAL_VEC  At33L = vec_load(At33[index]);
-    CCTK_REAL_VEC  B1L = vec_load(B1[index]);
-    CCTK_REAL_VEC  B2L = vec_load(B2[index]);
-    CCTK_REAL_VEC  B3L = vec_load(B3[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  gt11L = vec_load(gt11[index]);
-    CCTK_REAL_VEC  gt12L = vec_load(gt12[index]);
-    CCTK_REAL_VEC  gt13L = vec_load(gt13[index]);
-    CCTK_REAL_VEC  gt22L = vec_load(gt22[index]);
-    CCTK_REAL_VEC  gt23L = vec_load(gt23[index]);
-    CCTK_REAL_VEC  gt33L = vec_load(gt33[index]);
-    CCTK_REAL_VEC  phiL = vec_load(phi[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
-    CCTK_REAL_VEC  Xt1L = vec_load(Xt1[index]);
-    CCTK_REAL_VEC  Xt2L = vec_load(Xt2[index]);
-    CCTK_REAL_VEC  Xt3L = vec_load(Xt3[index]);
-    
-    /* Include user supplied include files */
-    
-    /* Precompute derivatives */
-    
-    /* Calculate temporaries and grid functions */
-    int dir1 = Sign(normal[0]);
-    
-    int dir2 = Sign(normal[1]);
-    
-    int dir3 = Sign(normal[2]);
-    
-    CCTK_REAL_VEC detgt = 1;
-    
-    CCTK_REAL_VEC gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
-    
-    CCTK_REAL_VEC gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
-    
-    CCTK_REAL_VEC gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
-    
-    CCTK_REAL_VEC gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
-    
-    CCTK_REAL_VEC gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
-    
-    CCTK_REAL_VEC gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
-    
-    CCTK_REAL_VEC em4phi = IfThen(conformalMethod,SQR(phiL),exp(-4*phiL));
-    
-    CCTK_REAL_VEC gu11 = em4phi*gtu11;
-    
-    CCTK_REAL_VEC gu21 = em4phi*gtu21;
-    
-    CCTK_REAL_VEC gu31 = em4phi*gtu31;
-    
-    CCTK_REAL_VEC gu22 = em4phi*gtu22;
-    
-    CCTK_REAL_VEC gu32 = em4phi*gtu32;
-    
-    CCTK_REAL_VEC gu33 = em4phi*gtu33;
-    
-    CCTK_REAL_VEC nn1 = normal[0];
-    
-    CCTK_REAL_VEC nn2 = normal[1];
-    
-    CCTK_REAL_VEC nn3 = normal[2];
-    
-    CCTK_REAL_VEC nu1 = gu11*nn1 + gu21*nn2 + gu31*nn3;
-    
-    CCTK_REAL_VEC nu2 = gu21*nn1 + gu22*nn2 + gu32*nn3;
-    
-    CCTK_REAL_VEC nu3 = gu31*nn1 + gu32*nn2 + gu33*nn3;
-    
-    CCTK_REAL_VEC nlen2 = nn1*nu1 + nn2*nu2 + nn3*nu3;
-    
-    CCTK_REAL_VEC nlen = pow(nlen2,0.5);
-    
-    CCTK_REAL_VEC su1 = nu1*INV(nlen);
-    
-    CCTK_REAL_VEC su2 = nu2*INV(nlen);
-    
-    CCTK_REAL_VEC su3 = nu3*INV(nlen);
-    
-    CCTK_REAL_VEC vg = pow(harmonicF,0.5);
-    
-    CCTK_REAL_VEC phirhsL = -((PDonesided1(phi, i, j, k)*su1 + 
-      PDonesided2(phi, i, j, k)*su2 + PDonesided3(phi, i, j, k)*su3)*vg);
-    
-    CCTK_REAL_VEC gt11rhsL = -(PDonesided1(gt11, i, j, k)*su1) - 
-      PDonesided2(gt11, i, j, k)*su2 - PDonesided3(gt11, i, j, k)*su3;
-    
-    CCTK_REAL_VEC gt12rhsL = -(PDonesided1(gt12, i, j, k)*su1) - 
-      PDonesided2(gt12, i, j, k)*su2 - PDonesided3(gt12, i, j, k)*su3;
-    
-    CCTK_REAL_VEC gt13rhsL = -(PDonesided1(gt13, i, j, k)*su1) - 
-      PDonesided2(gt13, i, j, k)*su2 - PDonesided3(gt13, i, j, k)*su3;
-    
-    CCTK_REAL_VEC gt22rhsL = -(PDonesided1(gt22, i, j, k)*su1) - 
-      PDonesided2(gt22, i, j, k)*su2 - PDonesided3(gt22, i, j, k)*su3;
-    
-    CCTK_REAL_VEC gt23rhsL = -(PDonesided1(gt23, i, j, k)*su1) - 
-      PDonesided2(gt23, i, j, k)*su2 - PDonesided3(gt23, i, j, k)*su3;
-    
-    CCTK_REAL_VEC gt33rhsL = -(PDonesided1(gt33, i, j, k)*su1) - 
-      PDonesided2(gt33, i, j, k)*su2 - PDonesided3(gt33, i, j, k)*su3;
-    
-    CCTK_REAL_VEC trKrhsL = -((PDonesided1(trK, i, j, k)*su1 + 
-      PDonesided2(trK, i, j, k)*su2 + PDonesided3(trK, i, j, k)*su3)*vg);
-    
-    CCTK_REAL_VEC At11rhsL = -(PDonesided1(At11, i, j, k)*su1) - 
-      PDonesided2(At11, i, j, k)*su2 - PDonesided3(At11, i, j, k)*su3;
-    
-    CCTK_REAL_VEC At12rhsL = -(PDonesided1(At12, i, j, k)*su1) - 
-      PDonesided2(At12, i, j, k)*su2 - PDonesided3(At12, i, j, k)*su3;
-    
-    CCTK_REAL_VEC At13rhsL = -(PDonesided1(At13, i, j, k)*su1) - 
-      PDonesided2(At13, i, j, k)*su2 - PDonesided3(At13, i, j, k)*su3;
-    
-    CCTK_REAL_VEC At22rhsL = -(PDonesided1(At22, i, j, k)*su1) - 
-      PDonesided2(At22, i, j, k)*su2 - PDonesided3(At22, i, j, k)*su3;
-    
-    CCTK_REAL_VEC At23rhsL = -(PDonesided1(At23, i, j, k)*su1) - 
-      PDonesided2(At23, i, j, k)*su2 - PDonesided3(At23, i, j, k)*su3;
-    
-    CCTK_REAL_VEC At33rhsL = -(PDonesided1(At33, i, j, k)*su1) - 
-      PDonesided2(At33, i, j, k)*su2 - PDonesided3(At33, i, j, k)*su3;
-    
-    CCTK_REAL_VEC Xt1rhsL = -(PDonesided1(Xt1, i, j, k)*su1) - 
-      PDonesided2(Xt1, i, j, k)*su2 - PDonesided3(Xt1, i, j, k)*su3;
-    
-    CCTK_REAL_VEC Xt2rhsL = -(PDonesided1(Xt2, i, j, k)*su1) - 
-      PDonesided2(Xt2, i, j, k)*su2 - PDonesided3(Xt2, i, j, k)*su3;
-    
-    CCTK_REAL_VEC Xt3rhsL = -(PDonesided1(Xt3, i, j, k)*su1) - 
-      PDonesided2(Xt3, i, j, k)*su2 - PDonesided3(Xt3, i, j, k)*su3;
-    
-    CCTK_REAL_VEC alpharhsL = -((PDonesided1(alpha, i, j, k)*su1 + 
-      PDonesided2(alpha, i, j, k)*su2 + PDonesided3(alpha, i, j, 
-      k)*su3)*vg);
-    
-    CCTK_REAL_VEC ArhsL = -((PDonesided1(A, i, j, k)*su1 + 
-      PDonesided2(A, i, j, k)*su2 + PDonesided3(A, i, j, k)*su3)*vg);
-    
-    CCTK_REAL_VEC beta1rhsL = -(PDonesided1(beta1, i, j, k)*su1) - 
-      PDonesided2(beta1, i, j, k)*su2 - PDonesided3(beta1, i, j, k)*su3;
-    
-    CCTK_REAL_VEC beta2rhsL = -(PDonesided1(beta2, i, j, k)*su1) - 
-      PDonesided2(beta2, i, j, k)*su2 - PDonesided3(beta2, i, j, k)*su3;
-    
-    CCTK_REAL_VEC beta3rhsL = -(PDonesided1(beta3, i, j, k)*su1) - 
-      PDonesided2(beta3, i, j, k)*su2 - PDonesided3(beta3, i, j, k)*su3;
-    
-    CCTK_REAL_VEC B1rhsL = -(PDonesided1(B1, i, j, k)*su1) - 
-      PDonesided2(B1, i, j, k)*su2 - PDonesided3(B1, i, j, k)*su3;
-    
-    CCTK_REAL_VEC B2rhsL = -(PDonesided1(B2, i, j, k)*su1) - 
-      PDonesided2(B2, i, j, k)*su2 - PDonesided3(B2, i, j, k)*su3;
-    
-    CCTK_REAL_VEC B3rhsL = -(PDonesided1(B3, i, j, k)*su1) - 
-      PDonesided2(B3, i, j, k)*su2 - PDonesided3(B3, i, j, k)*su3;
-    
-    
-    /* Copy local copies back to grid functions */
-    vec_store_nta(alpharhs[index],alpharhsL);
-    vec_store_nta(Arhs[index],ArhsL);
-    vec_store_nta(At11rhs[index],At11rhsL);
-    vec_store_nta(At12rhs[index],At12rhsL);
-    vec_store_nta(At13rhs[index],At13rhsL);
-    vec_store_nta(At22rhs[index],At22rhsL);
-    vec_store_nta(At23rhs[index],At23rhsL);
-    vec_store_nta(At33rhs[index],At33rhsL);
-    vec_store_nta(B1rhs[index],B1rhsL);
-    vec_store_nta(B2rhs[index],B2rhsL);
-    vec_store_nta(B3rhs[index],B3rhsL);
-    vec_store_nta(beta1rhs[index],beta1rhsL);
-    vec_store_nta(beta2rhs[index],beta2rhsL);
-    vec_store_nta(beta3rhs[index],beta3rhsL);
-    vec_store_nta(gt11rhs[index],gt11rhsL);
-    vec_store_nta(gt12rhs[index],gt12rhsL);
-    vec_store_nta(gt13rhs[index],gt13rhsL);
-    vec_store_nta(gt22rhs[index],gt22rhsL);
-    vec_store_nta(gt23rhs[index],gt23rhsL);
-    vec_store_nta(gt33rhs[index],gt33rhsL);
-    vec_store_nta(phirhs[index],phirhsL);
-    vec_store_nta(trKrhs[index],trKrhsL);
-    vec_store_nta(Xt1rhs[index],Xt1rhsL);
-    vec_store_nta(Xt2rhs[index],Xt2rhsL);
-    vec_store_nta(Xt3rhs[index],Xt3rhsL);
-  i += CCTK_REAL_VEC_SIZE-1;
-  }
-  LC_ENDLOOP3 (ML_BSSN_O8_RHSRadiativeBoundary);
-}
-
-extern "C" void ML_BSSN_O8_RHSRadiativeBoundary(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  GenericFD_LoopOverBoundary(cctkGH, &ML_BSSN_O8_RHSRadiativeBoundary_Body);
-}
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_RHSStaticBoundary.cc b/ML_BSSN_O8/src/ML_BSSN_O8_RHSStaticBoundary.c
index f2167da..985796d 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_RHSStaticBoundary.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_RHSStaticBoundary.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -103,89 +102,88 @@ static void ML_BSSN_O8_RHSStaticBoundary_Body(cGH const * restrict const cctkGH,
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC phirhsL = 0;
+    CCTK_REAL phirhsL = 0;
     
-    CCTK_REAL_VEC gt11rhsL = 0;
+    CCTK_REAL gt11rhsL = 0;
     
-    CCTK_REAL_VEC gt12rhsL = 0;
+    CCTK_REAL gt12rhsL = 0;
     
-    CCTK_REAL_VEC gt13rhsL = 0;
+    CCTK_REAL gt13rhsL = 0;
     
-    CCTK_REAL_VEC gt22rhsL = 0;
+    CCTK_REAL gt22rhsL = 0;
     
-    CCTK_REAL_VEC gt23rhsL = 0;
+    CCTK_REAL gt23rhsL = 0;
     
-    CCTK_REAL_VEC gt33rhsL = 0;
+    CCTK_REAL gt33rhsL = 0;
     
-    CCTK_REAL_VEC trKrhsL = 0;
+    CCTK_REAL trKrhsL = 0;
     
-    CCTK_REAL_VEC At11rhsL = 0;
+    CCTK_REAL At11rhsL = 0;
     
-    CCTK_REAL_VEC At12rhsL = 0;
+    CCTK_REAL At12rhsL = 0;
     
-    CCTK_REAL_VEC At13rhsL = 0;
+    CCTK_REAL At13rhsL = 0;
     
-    CCTK_REAL_VEC At22rhsL = 0;
+    CCTK_REAL At22rhsL = 0;
     
-    CCTK_REAL_VEC At23rhsL = 0;
+    CCTK_REAL At23rhsL = 0;
     
-    CCTK_REAL_VEC At33rhsL = 0;
+    CCTK_REAL At33rhsL = 0;
     
-    CCTK_REAL_VEC Xt1rhsL = 0;
+    CCTK_REAL Xt1rhsL = 0;
     
-    CCTK_REAL_VEC Xt2rhsL = 0;
+    CCTK_REAL Xt2rhsL = 0;
     
-    CCTK_REAL_VEC Xt3rhsL = 0;
+    CCTK_REAL Xt3rhsL = 0;
     
-    CCTK_REAL_VEC alpharhsL = 0;
+    CCTK_REAL alpharhsL = 0;
     
-    CCTK_REAL_VEC ArhsL = 0;
+    CCTK_REAL ArhsL = 0;
     
-    CCTK_REAL_VEC beta1rhsL = 0;
+    CCTK_REAL beta1rhsL = 0;
     
-    CCTK_REAL_VEC beta2rhsL = 0;
+    CCTK_REAL beta2rhsL = 0;
     
-    CCTK_REAL_VEC beta3rhsL = 0;
+    CCTK_REAL beta3rhsL = 0;
     
-    CCTK_REAL_VEC B1rhsL = 0;
+    CCTK_REAL B1rhsL = 0;
     
-    CCTK_REAL_VEC B2rhsL = 0;
+    CCTK_REAL B2rhsL = 0;
     
-    CCTK_REAL_VEC B3rhsL = 0;
+    CCTK_REAL B3rhsL = 0;
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(alpharhs[index],alpharhsL);
-    vec_store_nta(Arhs[index],ArhsL);
-    vec_store_nta(At11rhs[index],At11rhsL);
-    vec_store_nta(At12rhs[index],At12rhsL);
-    vec_store_nta(At13rhs[index],At13rhsL);
-    vec_store_nta(At22rhs[index],At22rhsL);
-    vec_store_nta(At23rhs[index],At23rhsL);
-    vec_store_nta(At33rhs[index],At33rhsL);
-    vec_store_nta(B1rhs[index],B1rhsL);
-    vec_store_nta(B2rhs[index],B2rhsL);
-    vec_store_nta(B3rhs[index],B3rhsL);
-    vec_store_nta(beta1rhs[index],beta1rhsL);
-    vec_store_nta(beta2rhs[index],beta2rhsL);
-    vec_store_nta(beta3rhs[index],beta3rhsL);
-    vec_store_nta(gt11rhs[index],gt11rhsL);
-    vec_store_nta(gt12rhs[index],gt12rhsL);
-    vec_store_nta(gt13rhs[index],gt13rhsL);
-    vec_store_nta(gt22rhs[index],gt22rhsL);
-    vec_store_nta(gt23rhs[index],gt23rhsL);
-    vec_store_nta(gt33rhs[index],gt33rhsL);
-    vec_store_nta(phirhs[index],phirhsL);
-    vec_store_nta(trKrhs[index],trKrhsL);
-    vec_store_nta(Xt1rhs[index],Xt1rhsL);
-    vec_store_nta(Xt2rhs[index],Xt2rhsL);
-    vec_store_nta(Xt3rhs[index],Xt3rhsL);
-  i += CCTK_REAL_VEC_SIZE-1;
+    alpharhs[index] = alpharhsL;
+    Arhs[index] = ArhsL;
+    At11rhs[index] = At11rhsL;
+    At12rhs[index] = At12rhsL;
+    At13rhs[index] = At13rhsL;
+    At22rhs[index] = At22rhsL;
+    At23rhs[index] = At23rhsL;
+    At33rhs[index] = At33rhsL;
+    B1rhs[index] = B1rhsL;
+    B2rhs[index] = B2rhsL;
+    B3rhs[index] = B3rhsL;
+    beta1rhs[index] = beta1rhsL;
+    beta2rhs[index] = beta2rhsL;
+    beta3rhs[index] = beta3rhsL;
+    gt11rhs[index] = gt11rhsL;
+    gt12rhs[index] = gt12rhsL;
+    gt13rhs[index] = gt13rhsL;
+    gt22rhs[index] = gt22rhsL;
+    gt23rhs[index] = gt23rhsL;
+    gt33rhs[index] = gt33rhsL;
+    phirhs[index] = phirhsL;
+    trKrhs[index] = trKrhsL;
+    Xt1rhs[index] = Xt1rhsL;
+    Xt2rhs[index] = Xt2rhsL;
+    Xt3rhs[index] = Xt3rhsL;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_RHSStaticBoundary);
 }
 
-extern "C" void ML_BSSN_O8_RHSStaticBoundary(CCTK_ARGUMENTS)
+void ML_BSSN_O8_RHSStaticBoundary(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_boundary.cc b/ML_BSSN_O8/src/ML_BSSN_O8_boundary.c
index e1b5310..0e28597 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_boundary.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_boundary.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_boundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_boundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -103,89 +102,88 @@ static void ML_BSSN_O8_boundary_Body(cGH const * restrict const cctkGH, int cons
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC phiL = IfThen(conformalMethod,1,0);
+    CCTK_REAL phiL = IfThen(conformalMethod,1,0);
     
-    CCTK_REAL_VEC gt11L = 1;
+    CCTK_REAL gt11L = 1;
     
-    CCTK_REAL_VEC gt12L = 0;
+    CCTK_REAL gt12L = 0;
     
-    CCTK_REAL_VEC gt13L = 0;
+    CCTK_REAL gt13L = 0;
     
-    CCTK_REAL_VEC gt22L = 1;
+    CCTK_REAL gt22L = 1;
     
-    CCTK_REAL_VEC gt23L = 0;
+    CCTK_REAL gt23L = 0;
     
-    CCTK_REAL_VEC gt33L = 1;
+    CCTK_REAL gt33L = 1;
     
-    CCTK_REAL_VEC trKL = 0;
+    CCTK_REAL trKL = 0;
     
-    CCTK_REAL_VEC At11L = 0;
+    CCTK_REAL At11L = 0;
     
-    CCTK_REAL_VEC At12L = 0;
+    CCTK_REAL At12L = 0;
     
-    CCTK_REAL_VEC At13L = 0;
+    CCTK_REAL At13L = 0;
     
-    CCTK_REAL_VEC At22L = 0;
+    CCTK_REAL At22L = 0;
     
-    CCTK_REAL_VEC At23L = 0;
+    CCTK_REAL At23L = 0;
     
-    CCTK_REAL_VEC At33L = 0;
+    CCTK_REAL At33L = 0;
     
-    CCTK_REAL_VEC Xt1L = 0;
+    CCTK_REAL Xt1L = 0;
     
-    CCTK_REAL_VEC Xt2L = 0;
+    CCTK_REAL Xt2L = 0;
     
-    CCTK_REAL_VEC Xt3L = 0;
+    CCTK_REAL Xt3L = 0;
     
-    CCTK_REAL_VEC alphaL = 1;
+    CCTK_REAL alphaL = 1;
     
-    CCTK_REAL_VEC AL = 0;
+    CCTK_REAL AL = 0;
     
-    CCTK_REAL_VEC beta1L = 0;
+    CCTK_REAL beta1L = 0;
     
-    CCTK_REAL_VEC beta2L = 0;
+    CCTK_REAL beta2L = 0;
     
-    CCTK_REAL_VEC beta3L = 0;
+    CCTK_REAL beta3L = 0;
     
-    CCTK_REAL_VEC B1L = 0;
+    CCTK_REAL B1L = 0;
     
-    CCTK_REAL_VEC B2L = 0;
+    CCTK_REAL B2L = 0;
     
-    CCTK_REAL_VEC B3L = 0;
+    CCTK_REAL B3L = 0;
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(A[index],AL);
-    vec_store_nta(alpha[index],alphaL);
-    vec_store_nta(At11[index],At11L);
-    vec_store_nta(At12[index],At12L);
-    vec_store_nta(At13[index],At13L);
-    vec_store_nta(At22[index],At22L);
-    vec_store_nta(At23[index],At23L);
-    vec_store_nta(At33[index],At33L);
-    vec_store_nta(B1[index],B1L);
-    vec_store_nta(B2[index],B2L);
-    vec_store_nta(B3[index],B3L);
-    vec_store_nta(beta1[index],beta1L);
-    vec_store_nta(beta2[index],beta2L);
-    vec_store_nta(beta3[index],beta3L);
-    vec_store_nta(gt11[index],gt11L);
-    vec_store_nta(gt12[index],gt12L);
-    vec_store_nta(gt13[index],gt13L);
-    vec_store_nta(gt22[index],gt22L);
-    vec_store_nta(gt23[index],gt23L);
-    vec_store_nta(gt33[index],gt33L);
-    vec_store_nta(phi[index],phiL);
-    vec_store_nta(trK[index],trKL);
-    vec_store_nta(Xt1[index],Xt1L);
-    vec_store_nta(Xt2[index],Xt2L);
-    vec_store_nta(Xt3[index],Xt3L);
-  i += CCTK_REAL_VEC_SIZE-1;
+    A[index] = AL;
+    alpha[index] = alphaL;
+    At11[index] = At11L;
+    At12[index] = At12L;
+    At13[index] = At13L;
+    At22[index] = At22L;
+    At23[index] = At23L;
+    At33[index] = At33L;
+    B1[index] = B1L;
+    B2[index] = B2L;
+    B3[index] = B3L;
+    beta1[index] = beta1L;
+    beta2[index] = beta2L;
+    beta3[index] = beta3L;
+    gt11[index] = gt11L;
+    gt12[index] = gt12L;
+    gt13[index] = gt13L;
+    gt22[index] = gt22L;
+    gt23[index] = gt23L;
+    gt33[index] = gt33L;
+    phi[index] = phiL;
+    trK[index] = trKL;
+    Xt1[index] = Xt1L;
+    Xt2[index] = Xt2L;
+    Xt3[index] = Xt3L;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_boundary);
 }
 
-extern "C" void ML_BSSN_O8_boundary(CCTK_ARGUMENTS)
+void ML_BSSN_O8_boundary(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_constraints.cc b/ML_BSSN_O8/src/ML_BSSN_O8_constraints.c
index fba506a..fb000ba 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_constraints.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_constraints.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -95,318 +94,318 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
     // int index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
     /* Declare derivatives */
-    // CCTK_REAL_VEC PDstandardNth1At11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2At11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3At11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1At12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2At12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3At12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1At13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2At13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3At13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1At22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2At22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3At22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1At23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2At23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3At23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1At33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2At33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3At33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth11phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth22phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth33phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth12phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth13phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth23phi = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1trK = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2trK = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3trK = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3Xt1 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3Xt2 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2Xt3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3Xt3 = INITVALUE;
+    // CCTK_REAL PDstandardNth1At11 = INITVALUE;
+    // CCTK_REAL PDstandardNth2At11 = INITVALUE;
+    // CCTK_REAL PDstandardNth3At11 = INITVALUE;
+    // CCTK_REAL PDstandardNth1At12 = INITVALUE;
+    // CCTK_REAL PDstandardNth2At12 = INITVALUE;
+    // CCTK_REAL PDstandardNth3At12 = INITVALUE;
+    // CCTK_REAL PDstandardNth1At13 = INITVALUE;
+    // CCTK_REAL PDstandardNth2At13 = INITVALUE;
+    // CCTK_REAL PDstandardNth3At13 = INITVALUE;
+    // CCTK_REAL PDstandardNth1At22 = INITVALUE;
+    // CCTK_REAL PDstandardNth2At22 = INITVALUE;
+    // CCTK_REAL PDstandardNth3At22 = INITVALUE;
+    // CCTK_REAL PDstandardNth1At23 = INITVALUE;
+    // CCTK_REAL PDstandardNth2At23 = INITVALUE;
+    // CCTK_REAL PDstandardNth3At23 = INITVALUE;
+    // CCTK_REAL PDstandardNth1At33 = INITVALUE;
+    // CCTK_REAL PDstandardNth2At33 = INITVALUE;
+    // CCTK_REAL PDstandardNth3At33 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth11gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth22gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth33gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth12gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth13gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth23gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth1phi = INITVALUE;
+    // CCTK_REAL PDstandardNth2phi = INITVALUE;
+    // CCTK_REAL PDstandardNth3phi = INITVALUE;
+    // CCTK_REAL PDstandardNth11phi = INITVALUE;
+    // CCTK_REAL PDstandardNth22phi = INITVALUE;
+    // CCTK_REAL PDstandardNth33phi = INITVALUE;
+    // CCTK_REAL PDstandardNth12phi = INITVALUE;
+    // CCTK_REAL PDstandardNth13phi = INITVALUE;
+    // CCTK_REAL PDstandardNth23phi = INITVALUE;
+    // CCTK_REAL PDstandardNth1trK = INITVALUE;
+    // CCTK_REAL PDstandardNth2trK = INITVALUE;
+    // CCTK_REAL PDstandardNth3trK = INITVALUE;
+    // CCTK_REAL PDstandardNth1Xt1 = INITVALUE;
+    // CCTK_REAL PDstandardNth2Xt1 = INITVALUE;
+    // CCTK_REAL PDstandardNth3Xt1 = INITVALUE;
+    // CCTK_REAL PDstandardNth1Xt2 = INITVALUE;
+    // CCTK_REAL PDstandardNth2Xt2 = INITVALUE;
+    // CCTK_REAL PDstandardNth3Xt2 = INITVALUE;
+    // CCTK_REAL PDstandardNth1Xt3 = INITVALUE;
+    // CCTK_REAL PDstandardNth2Xt3 = INITVALUE;
+    // CCTK_REAL PDstandardNth3Xt3 = INITVALUE;
     
     /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  At11L = vec_load(At11[index]);
-    CCTK_REAL_VEC  At12L = vec_load(At12[index]);
-    CCTK_REAL_VEC  At13L = vec_load(At13[index]);
-    CCTK_REAL_VEC  At22L = vec_load(At22[index]);
-    CCTK_REAL_VEC  At23L = vec_load(At23[index]);
-    CCTK_REAL_VEC  At33L = vec_load(At33[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  eTttL = (*stress_energy_state) ? vec_load(eTtt[index]) : 0.0;
-    CCTK_REAL_VEC  eTtxL = (*stress_energy_state) ? vec_load(eTtx[index]) : 0.0;
-    CCTK_REAL_VEC  eTtyL = (*stress_energy_state) ? vec_load(eTty[index]) : 0.0;
-    CCTK_REAL_VEC  eTtzL = (*stress_energy_state) ? vec_load(eTtz[index]) : 0.0;
-    CCTK_REAL_VEC  eTxxL = (*stress_energy_state) ? vec_load(eTxx[index]) : 0.0;
-    CCTK_REAL_VEC  eTxyL = (*stress_energy_state) ? vec_load(eTxy[index]) : 0.0;
-    CCTK_REAL_VEC  eTxzL = (*stress_energy_state) ? vec_load(eTxz[index]) : 0.0;
-    CCTK_REAL_VEC  eTyyL = (*stress_energy_state) ? vec_load(eTyy[index]) : 0.0;
-    CCTK_REAL_VEC  eTyzL = (*stress_energy_state) ? vec_load(eTyz[index]) : 0.0;
-    CCTK_REAL_VEC  eTzzL = (*stress_energy_state) ? vec_load(eTzz[index]) : 0.0;
-    CCTK_REAL_VEC  gt11L = vec_load(gt11[index]);
-    CCTK_REAL_VEC  gt12L = vec_load(gt12[index]);
-    CCTK_REAL_VEC  gt13L = vec_load(gt13[index]);
-    CCTK_REAL_VEC  gt22L = vec_load(gt22[index]);
-    CCTK_REAL_VEC  gt23L = vec_load(gt23[index]);
-    CCTK_REAL_VEC  gt33L = vec_load(gt33[index]);
-    CCTK_REAL_VEC  phiL = vec_load(phi[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
-    CCTK_REAL_VEC  Xt1L = vec_load(Xt1[index]);
-    CCTK_REAL_VEC  Xt2L = vec_load(Xt2[index]);
-    CCTK_REAL_VEC  Xt3L = vec_load(Xt3[index]);
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  At11L = At11[index];
+    CCTK_REAL  At12L = At12[index];
+    CCTK_REAL  At13L = At13[index];
+    CCTK_REAL  At22L = At22[index];
+    CCTK_REAL  At23L = At23[index];
+    CCTK_REAL  At33L = At33[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  eTttL = (*stress_energy_state) ? (eTtt[index]) : 0.0;
+    CCTK_REAL  eTtxL = (*stress_energy_state) ? (eTtx[index]) : 0.0;
+    CCTK_REAL  eTtyL = (*stress_energy_state) ? (eTty[index]) : 0.0;
+    CCTK_REAL  eTtzL = (*stress_energy_state) ? (eTtz[index]) : 0.0;
+    CCTK_REAL  eTxxL = (*stress_energy_state) ? (eTxx[index]) : 0.0;
+    CCTK_REAL  eTxyL = (*stress_energy_state) ? (eTxy[index]) : 0.0;
+    CCTK_REAL  eTxzL = (*stress_energy_state) ? (eTxz[index]) : 0.0;
+    CCTK_REAL  eTyyL = (*stress_energy_state) ? (eTyy[index]) : 0.0;
+    CCTK_REAL  eTyzL = (*stress_energy_state) ? (eTyz[index]) : 0.0;
+    CCTK_REAL  eTzzL = (*stress_energy_state) ? (eTzz[index]) : 0.0;
+    CCTK_REAL  gt11L = gt11[index];
+    CCTK_REAL  gt12L = gt12[index];
+    CCTK_REAL  gt13L = gt13[index];
+    CCTK_REAL  gt22L = gt22[index];
+    CCTK_REAL  gt23L = gt23[index];
+    CCTK_REAL  gt33L = gt33[index];
+    CCTK_REAL  phiL = phi[index];
+    CCTK_REAL  trKL = trK[index];
+    CCTK_REAL  Xt1L = Xt1[index];
+    CCTK_REAL  Xt2L = Xt2[index];
+    CCTK_REAL  Xt3L = Xt3[index];
     
     /* Include user supplied include files */
     
     /* Precompute derivatives */
-    CCTK_REAL_VEC const PDstandardNth1At11 = PDstandardNth1(At11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2At11 = PDstandardNth2(At11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3At11 = PDstandardNth3(At11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1At12 = PDstandardNth1(At12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2At12 = PDstandardNth2(At12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3At12 = PDstandardNth3(At12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1At13 = PDstandardNth1(At13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2At13 = PDstandardNth2(At13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3At13 = PDstandardNth3(At13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1At22 = PDstandardNth1(At22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2At22 = PDstandardNth2(At22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3At22 = PDstandardNth3(At22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1At23 = PDstandardNth1(At23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2At23 = PDstandardNth2(At23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3At23 = PDstandardNth3(At23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1At33 = PDstandardNth1(At33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2At33 = PDstandardNth2(At33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3At33 = PDstandardNth3(At33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt11 = PDstandardNth11(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt11 = PDstandardNth22(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt11 = PDstandardNth33(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt11 = PDstandardNth12(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt11 = PDstandardNth13(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt11 = PDstandardNth23(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt12 = PDstandardNth1(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt12 = PDstandardNth2(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt12 = PDstandardNth3(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt12 = PDstandardNth11(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt12 = PDstandardNth22(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt12 = PDstandardNth33(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt12 = PDstandardNth12(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt12 = PDstandardNth13(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt12 = PDstandardNth23(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt13 = PDstandardNth1(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt13 = PDstandardNth2(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt13 = PDstandardNth3(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt13 = PDstandardNth11(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt13 = PDstandardNth22(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt13 = PDstandardNth33(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt13 = PDstandardNth12(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt13 = PDstandardNth13(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt13 = PDstandardNth23(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt22 = PDstandardNth1(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt22 = PDstandardNth2(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt22 = PDstandardNth3(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt22 = PDstandardNth11(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt22 = PDstandardNth22(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt22 = PDstandardNth33(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt22 = PDstandardNth12(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt22 = PDstandardNth13(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt22 = PDstandardNth23(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt23 = PDstandardNth1(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt23 = PDstandardNth2(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt23 = PDstandardNth3(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt23 = PDstandardNth11(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt23 = PDstandardNth22(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt23 = PDstandardNth33(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt23 = PDstandardNth12(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt23 = PDstandardNth13(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt23 = PDstandardNth23(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt33 = PDstandardNth1(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11gt33 = PDstandardNth11(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22gt33 = PDstandardNth22(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33gt33 = PDstandardNth33(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12gt33 = PDstandardNth12(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13gt33 = PDstandardNth13(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23gt33 = PDstandardNth23(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1phi = PDstandardNth1(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2phi = PDstandardNth2(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3phi = PDstandardNth3(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth11phi = PDstandardNth11(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth22phi = PDstandardNth22(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth33phi = PDstandardNth33(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth12phi = PDstandardNth12(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth13phi = PDstandardNth13(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth23phi = PDstandardNth23(phi, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1trK = PDstandardNth1(trK, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2trK = PDstandardNth2(trK, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3trK = PDstandardNth3(trK, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1Xt1 = PDstandardNth1(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2Xt1 = PDstandardNth2(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3Xt1 = PDstandardNth3(Xt1, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1Xt2 = PDstandardNth1(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2Xt2 = PDstandardNth2(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3Xt2 = PDstandardNth3(Xt2, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1Xt3 = PDstandardNth1(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2Xt3 = PDstandardNth2(Xt3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3Xt3 = PDstandardNth3(Xt3, i, j, k);
+    CCTK_REAL const PDstandardNth1At11 = PDstandardNth1(At11, i, j, k);
+    CCTK_REAL const PDstandardNth2At11 = PDstandardNth2(At11, i, j, k);
+    CCTK_REAL const PDstandardNth3At11 = PDstandardNth3(At11, i, j, k);
+    CCTK_REAL const PDstandardNth1At12 = PDstandardNth1(At12, i, j, k);
+    CCTK_REAL const PDstandardNth2At12 = PDstandardNth2(At12, i, j, k);
+    CCTK_REAL const PDstandardNth3At12 = PDstandardNth3(At12, i, j, k);
+    CCTK_REAL const PDstandardNth1At13 = PDstandardNth1(At13, i, j, k);
+    CCTK_REAL const PDstandardNth2At13 = PDstandardNth2(At13, i, j, k);
+    CCTK_REAL const PDstandardNth3At13 = PDstandardNth3(At13, i, j, k);
+    CCTK_REAL const PDstandardNth1At22 = PDstandardNth1(At22, i, j, k);
+    CCTK_REAL const PDstandardNth2At22 = PDstandardNth2(At22, i, j, k);
+    CCTK_REAL const PDstandardNth3At22 = PDstandardNth3(At22, i, j, k);
+    CCTK_REAL const PDstandardNth1At23 = PDstandardNth1(At23, i, j, k);
+    CCTK_REAL const PDstandardNth2At23 = PDstandardNth2(At23, i, j, k);
+    CCTK_REAL const PDstandardNth3At23 = PDstandardNth3(At23, i, j, k);
+    CCTK_REAL const PDstandardNth1At33 = PDstandardNth1(At33, i, j, k);
+    CCTK_REAL const PDstandardNth2At33 = PDstandardNth2(At33, i, j, k);
+    CCTK_REAL const PDstandardNth3At33 = PDstandardNth3(At33, i, j, k);
+    CCTK_REAL const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth11gt11 = PDstandardNth11(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth22gt11 = PDstandardNth22(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth33gt11 = PDstandardNth33(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth12gt11 = PDstandardNth12(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth13gt11 = PDstandardNth13(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth23gt11 = PDstandardNth23(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth1gt12 = PDstandardNth1(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth2gt12 = PDstandardNth2(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth3gt12 = PDstandardNth3(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth11gt12 = PDstandardNth11(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth22gt12 = PDstandardNth22(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth33gt12 = PDstandardNth33(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth12gt12 = PDstandardNth12(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth13gt12 = PDstandardNth13(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth23gt12 = PDstandardNth23(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth1gt13 = PDstandardNth1(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth2gt13 = PDstandardNth2(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth3gt13 = PDstandardNth3(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth11gt13 = PDstandardNth11(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth22gt13 = PDstandardNth22(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth33gt13 = PDstandardNth33(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth12gt13 = PDstandardNth12(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth13gt13 = PDstandardNth13(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth23gt13 = PDstandardNth23(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth1gt22 = PDstandardNth1(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth2gt22 = PDstandardNth2(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth3gt22 = PDstandardNth3(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth11gt22 = PDstandardNth11(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth22gt22 = PDstandardNth22(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth33gt22 = PDstandardNth33(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth12gt22 = PDstandardNth12(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth13gt22 = PDstandardNth13(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth23gt22 = PDstandardNth23(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth1gt23 = PDstandardNth1(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth2gt23 = PDstandardNth2(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth3gt23 = PDstandardNth3(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth11gt23 = PDstandardNth11(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth22gt23 = PDstandardNth22(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth33gt23 = PDstandardNth33(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth12gt23 = PDstandardNth12(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth13gt23 = PDstandardNth13(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth23gt23 = PDstandardNth23(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth1gt33 = PDstandardNth1(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth11gt33 = PDstandardNth11(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth22gt33 = PDstandardNth22(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth33gt33 = PDstandardNth33(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth12gt33 = PDstandardNth12(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth13gt33 = PDstandardNth13(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth23gt33 = PDstandardNth23(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth1phi = PDstandardNth1(phi, i, j, k);
+    CCTK_REAL const PDstandardNth2phi = PDstandardNth2(phi, i, j, k);
+    CCTK_REAL const PDstandardNth3phi = PDstandardNth3(phi, i, j, k);
+    CCTK_REAL const PDstandardNth11phi = PDstandardNth11(phi, i, j, k);
+    CCTK_REAL const PDstandardNth22phi = PDstandardNth22(phi, i, j, k);
+    CCTK_REAL const PDstandardNth33phi = PDstandardNth33(phi, i, j, k);
+    CCTK_REAL const PDstandardNth12phi = PDstandardNth12(phi, i, j, k);
+    CCTK_REAL const PDstandardNth13phi = PDstandardNth13(phi, i, j, k);
+    CCTK_REAL const PDstandardNth23phi = PDstandardNth23(phi, i, j, k);
+    CCTK_REAL const PDstandardNth1trK = PDstandardNth1(trK, i, j, k);
+    CCTK_REAL const PDstandardNth2trK = PDstandardNth2(trK, i, j, k);
+    CCTK_REAL const PDstandardNth3trK = PDstandardNth3(trK, i, j, k);
+    CCTK_REAL const PDstandardNth1Xt1 = PDstandardNth1(Xt1, i, j, k);
+    CCTK_REAL const PDstandardNth2Xt1 = PDstandardNth2(Xt1, i, j, k);
+    CCTK_REAL const PDstandardNth3Xt1 = PDstandardNth3(Xt1, i, j, k);
+    CCTK_REAL const PDstandardNth1Xt2 = PDstandardNth1(Xt2, i, j, k);
+    CCTK_REAL const PDstandardNth2Xt2 = PDstandardNth2(Xt2, i, j, k);
+    CCTK_REAL const PDstandardNth3Xt2 = PDstandardNth3(Xt2, i, j, k);
+    CCTK_REAL const PDstandardNth1Xt3 = PDstandardNth1(Xt3, i, j, k);
+    CCTK_REAL const PDstandardNth2Xt3 = PDstandardNth2(Xt3, i, j, k);
+    CCTK_REAL const PDstandardNth3Xt3 = PDstandardNth3(Xt3, i, j, k);
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC detgt = 1;
+    CCTK_REAL detgt = 1;
     
-    CCTK_REAL_VEC gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
+    CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
     
-    CCTK_REAL_VEC gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
+    CCTK_REAL gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
+    CCTK_REAL gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
+    CCTK_REAL gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
     
-    CCTK_REAL_VEC gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
+    CCTK_REAL gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
+    CCTK_REAL gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
     
-    CCTK_REAL_VEC Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
+    CCTK_REAL Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
       2*(gtu21*PDstandardNth1gt12 + gtu31*PDstandardNth1gt13) - 
       gtu21*PDstandardNth2gt11 - gtu31*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
+    CCTK_REAL Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
       2*(gtu22*PDstandardNth1gt12 + gtu32*PDstandardNth1gt13) - 
       gtu22*PDstandardNth2gt11 - gtu32*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
+    CCTK_REAL Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
       2*(gtu32*PDstandardNth1gt12 + gtu33*PDstandardNth1gt13) - 
       gtu32*PDstandardNth2gt11 - gtu33*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
+    CCTK_REAL Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
       gtu11*PDstandardNth2gt11 + gtu31*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
+    CCTK_REAL Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
       gtu21*PDstandardNth2gt11 + gtu32*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
+    CCTK_REAL Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
       gtu31*PDstandardNth2gt11 + gtu33*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
+    CCTK_REAL Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
       gtu11*PDstandardNth3gt11 + gtu21*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
+    CCTK_REAL Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
       gtu21*PDstandardNth3gt11 + gtu22*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
+    CCTK_REAL Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
       gtu31*PDstandardNth3gt11 + gtu32*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu21*PDstandardNth2gt22 + 
       gtu31*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu22*PDstandardNth2gt22 + 
       gtu32*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu32*PDstandardNth2gt22 + 
       gtu33*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
+    CCTK_REAL Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
       gtu11*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu21*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
+    CCTK_REAL Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
       gtu21*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu22*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
+    CCTK_REAL Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
       gtu31*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu32*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
+    CCTK_REAL Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
       gtu21*PDstandardNth2gt33 + 2*gtu11*PDstandardNth3gt13 + 
       2*gtu21*PDstandardNth3gt23 + gtu31*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
+    CCTK_REAL Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
       gtu22*PDstandardNth2gt33 + 2*gtu21*PDstandardNth3gt13 + 
       2*gtu22*PDstandardNth3gt23 + gtu32*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
+    CCTK_REAL Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
       gtu32*PDstandardNth2gt33 + 2*gtu31*PDstandardNth3gt13 + 
       2*gtu32*PDstandardNth3gt23 + gtu33*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Rt11 = -(gtu11*khalf*PDstandardNth11gt11) + 
+    CCTK_REAL Rt11 = -(gtu11*khalf*PDstandardNth11gt11) + 
       gtu21*(2*Gt211*Gt212*gt22L + 4*Gt112*gt13L*Gt311 + 2*Gt113*gt11L*Gt312 
       + 2*gt13L*Gt312*Gt313 + 2*gt13L*Gt211*Gt322 + 2*gt13L*Gt311*Gt323 + 
       2*Gt311*Gt312*gt33L - PDstandardNth12gt11) - gtu31*PDstandardNth13gt11 
@@ -457,7 +456,7 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
       gt33L*gtu22*SQR(Gt312) + 2*gt13L*gtu31*SQR(Gt313) + 
       gt33L*gtu33*SQR(Gt313);
     
-    CCTK_REAL_VEC Rt12 = khalf*(-(gtu11*PDstandardNth11gt12) - 
+    CCTK_REAL Rt12 = khalf*(-(gtu11*PDstandardNth11gt12) - 
       2*gtu21*PDstandardNth12gt12 - 2*gtu31*PDstandardNth13gt12 + 
       gt12L*PDstandardNth1Xt1 + gt22L*PDstandardNth1Xt2 + 
       gt23L*PDstandardNth1Xt3 - gtu22*PDstandardNth22gt12 - 
@@ -530,7 +529,7 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
       gt13L*Gt323) + gt12L*(Gt122*Gt213 + Gt123*(2*Gt212 + Gt313) + 
       Gt223*(Gt222 + Gt323)) + Gt312*Gt323*gt33L + gt13L*SQR(Gt323)));
     
-    CCTK_REAL_VEC Rt13 = khalf*(-(gtu11*PDstandardNth11gt13) - 
+    CCTK_REAL Rt13 = khalf*(-(gtu11*PDstandardNth11gt13) - 
       2*gtu21*PDstandardNth12gt13 - 2*gtu31*PDstandardNth13gt13 + 
       gt13L*PDstandardNth1Xt1 + gt23L*PDstandardNth1Xt2 + 
       gt33L*PDstandardNth1Xt3 - gtu22*PDstandardNth22gt13 - 
@@ -605,15 +604,15 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
       Gt113*(2*gt11L*Gt133 + gt12L*Gt233 + Gt213*gt23L + gt13L*Gt333 + 
       Gt313*gt33L) + gt13L*SQR(Gt113) + gt13L*SQR(Gt333)));
     
-    CCTK_REAL_VEC Rt22 = 4*(Gt122*gt12L*Gt212*gtu21 + 
-      Gt112*gt12L*Gt222*gtu21 + Gt122*gt12L*Gt222*gtu22 + 
-      Gt123*gt12L*Gt212*gtu31 + Gt123*gt12L*Gt222*gtu32 + 
-      Gt123*gt12L*Gt223*gtu33) - gtu11*khalf*PDstandardNth11gt22 + 
-      gtu21*(6*Gt212*Gt222*gt22L + 2*Gt122*gt23L*Gt311 + 2*Gt122*gt13L*Gt312 
-      + 4*Gt222*gt23L*Gt312 + 2*Gt113*gt12L*Gt322 + 2*gt23L*Gt312*Gt323 + 
-      2*Gt312*Gt322*gt33L - PDstandardNth12gt22) + gtu31*(6*Gt212*Gt223*gt22L 
-      + 2*Gt123*gt13L*Gt312 + 2*Gt112*gt23L*Gt313 + 2*Gt113*gt12L*Gt323 + 
-      2*gt23L*Gt312*Gt333 + 2*Gt312*Gt323*gt33L - PDstandardNth13gt22) - 
+    CCTK_REAL Rt22 = 4*(Gt122*gt12L*Gt212*gtu21 + Gt112*gt12L*Gt222*gtu21 
+      + Gt122*gt12L*Gt222*gtu22 + Gt123*gt12L*Gt212*gtu31 + 
+      Gt123*gt12L*Gt222*gtu32 + Gt123*gt12L*Gt223*gtu33) - 
+      gtu11*khalf*PDstandardNth11gt22 + gtu21*(6*Gt212*Gt222*gt22L + 
+      2*Gt122*gt23L*Gt311 + 2*Gt122*gt13L*Gt312 + 4*Gt222*gt23L*Gt312 + 
+      2*Gt113*gt12L*Gt322 + 2*gt23L*Gt312*Gt323 + 2*Gt312*Gt322*gt33L - 
+      PDstandardNth12gt22) + gtu31*(6*Gt212*Gt223*gt22L + 2*Gt123*gt13L*Gt312 
+      + 2*Gt112*gt23L*Gt313 + 2*Gt113*gt12L*Gt323 + 2*gt23L*Gt312*Gt333 + 
+      2*Gt312*Gt323*gt33L - PDstandardNth13gt22) - 
       gtu22*khalf*PDstandardNth22gt22 + gtu32*(4*Gt122*gt12L*Gt223 + 
       2*Gt123*Gt212*gt22L + 2*gt12L*Gt133*Gt322 + 4*Gt223*gt23L*Gt322 + 
       2*Gt123*gt12L*Gt323 + 4*Gt222*gt23L*Gt323 + 2*gt23L*Gt322*Gt333 + 
@@ -654,7 +653,7 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
       gt33L*gtu11*SQR(Gt312) + gt33L*gtu22*SQR(Gt322) + 
       2*gt23L*gtu32*SQR(Gt323) + gt33L*gtu33*SQR(Gt323);
     
-    CCTK_REAL_VEC Rt23 = khalf*(-(gtu11*PDstandardNth11gt23) - 
+    CCTK_REAL Rt23 = khalf*(-(gtu11*PDstandardNth11gt23) - 
       2*gtu21*PDstandardNth12gt23 - 2*gtu31*PDstandardNth13gt23 - 
       gtu22*PDstandardNth22gt23 - 2*gtu32*PDstandardNth23gt23 + 
       gt13L*PDstandardNth2Xt1 + gt23L*PDstandardNth2Xt2 + 
@@ -733,200 +732,199 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
       Gt223*gt23L*Gt333 + Gt123*Gt313*gt33L + Gt223*Gt323*gt33L + 
       2*Gt323*Gt333*gt33L + gt23L*SQR(Gt223) + gt23L*SQR(Gt333)));
     
-    CCTK_REAL_VEC Rt33 = 4*(Gt123*gt13L*Gt323*gtu22 + 
-      Gt223*gt23L*Gt323*gtu22 + Gt133*gt13L*Gt313*gtu31 + 
-      Gt233*gt23L*Gt313*gtu31 + Gt113*gt13L*Gt333*gtu31 + 
-      Gt133*gt13L*Gt323*gtu32 + Gt233*gt23L*Gt323*gtu32 + 
-      Gt123*gt13L*Gt333*gtu32 + Gt133*gt13L*Gt333*gtu33) + 
-      gtu21*(2*Gt212*Gt223*gt23L + 4*Gt123*gt13L*Gt313 + 4*Gt223*gt23L*Gt313 
-      + 4*Gt113*gt13L*Gt323 + 4*Gt213*gt23L*Gt323 + 2*Gt123*Gt311*gt33L - 
-      PDstandardNth12gt33) + gtu31*(4*Gt213*gt23L*Gt333 + 2*Gt233*Gt312*gt33L 
-      + 6*Gt313*Gt333*gt33L - PDstandardNth13gt33) - 
-      gtu22*khalf*PDstandardNth22gt33 + gtu32*(4*Gt223*gt23L*Gt333 + 
-      2*Gt123*Gt313*gt33L + 6*Gt323*Gt333*gt33L - PDstandardNth23gt33) - 
-      gtu33*khalf*PDstandardNth33gt33 + gt13L*PDstandardNth3Xt1 + 
-      gt23L*PDstandardNth3Xt2 + gt33L*(2*Gt213*Gt322*gtu21 + 
-      6*Gt313*Gt323*gtu21 + 2*Gt123*Gt312*gtu22 + 2*Gt133*Gt311*gtu31 + 
-      2*Gt133*Gt312*gtu32 + 2*Gt133*Gt313*gtu33 + PDstandardNth3Xt3) + 
-      Gt113*gt13L*Xt1L + Gt213*gt23L*Xt1L + Gt313*gt33L*Xt1L + 
-      Gt123*gt13L*Xt2L + Gt223*gt23L*Xt2L + Gt323*gt33L*Xt2L + 
-      Gt133*gt13L*Xt3L + Gt333*gt33L*Xt3L + Gt233*(4*gt23L*Gt333*gtu33 + 
-      2*Gt323*gt33L*gtu33 + gt23L*Xt3L) + gtu11*(2*Gt212*Gt213*gt23L + 
-      4*Gt113*gt13L*Gt313 + 4*Gt213*gt23L*Gt313 + 2*Gt113*Gt311*gt33L + 
-      2*Gt213*Gt312*gt33L - khalf*PDstandardNth11gt33 + gt11L*SQR(Gt113)) + 
-      2*(Gt111*Gt113*gt13L*gtu11 + Gt113*gt12L*Gt213*gtu11 + 
-      Gt112*gt13L*Gt213*gtu11 + Gt113*Gt211*gt23L*gtu11 + 
-      Gt113*gt11L*Gt123*gtu21 + Gt112*Gt113*gt13L*gtu21 + 
-      Gt111*Gt123*gt13L*gtu21 + Gt123*gt12L*Gt213*gtu21 + 
-      Gt122*gt13L*Gt213*gtu21 + Gt113*gt12L*Gt223*gtu21 + 
-      Gt112*gt13L*Gt223*gtu21 + Gt213*Gt223*gt22L*gtu21 + 
-      Gt123*Gt211*gt23L*gtu21 + Gt113*Gt212*gt23L*gtu21 + 
-      Gt213*Gt222*gt23L*gtu21 + Gt113*Gt312*gt33L*gtu21 + 
-      Gt223*Gt312*gt33L*gtu21 + Gt112*Gt123*gt13L*gtu22 + 
-      Gt123*gt12L*Gt223*gtu22 + Gt122*gt13L*Gt223*gtu22 + 
-      Gt123*Gt212*gt23L*gtu22 + Gt222*Gt223*gt23L*gtu22 + 
-      Gt223*Gt322*gt33L*gtu22 + Gt113*gt11L*Gt133*gtu31 + 
-      Gt111*Gt133*gt13L*gtu31 + gt12L*Gt133*Gt213*gtu31 + 
-      Gt123*gt13L*Gt213*gtu31 + Gt113*gt12L*Gt233*gtu31 + 
-      Gt112*gt13L*Gt233*gtu31 + Gt213*gt22L*Gt233*gtu31 + 
-      Gt133*Gt211*gt23L*gtu31 + Gt113*Gt213*gt23L*gtu31 + 
-      Gt213*Gt223*gt23L*gtu31 + Gt212*Gt233*gt23L*gtu31 + 
-      Gt113*Gt313*gt33L*gtu31 + Gt213*Gt323*gt33L*gtu31 + 
-      gt11L*Gt123*Gt133*gtu32 + Gt113*Gt123*gt13L*gtu32 + 
-      Gt112*Gt133*gt13L*gtu32 + gt12L*Gt133*Gt223*gtu32 + 
-      Gt123*gt13L*Gt223*gtu32 + Gt123*gt12L*Gt233*gtu32 + 
-      Gt122*gt13L*Gt233*gtu32 + Gt223*gt22L*Gt233*gtu32 + 
-      Gt133*Gt212*gt23L*gtu32 + Gt123*Gt213*gt23L*gtu32 + 
-      Gt222*Gt233*gt23L*gtu32 + Gt233*Gt322*gt33L*gtu32 + 
-      Gt223*Gt323*gt33L*gtu32 + Gt113*Gt133*gt13L*gtu33 + 
-      gt12L*Gt133*Gt233*gtu33 + Gt123*gt13L*Gt233*gtu33 + 
-      Gt133*Gt213*gt23L*gtu33 + Gt223*Gt233*gt23L*gtu33 + 
-      gt13L*gtu31*SQR(Gt113)) + gt11L*gtu22*SQR(Gt123) + 
-      gt11L*gtu33*SQR(Gt133) + gt22L*gtu11*SQR(Gt213) + 
-      gt22L*gtu22*SQR(Gt223) + 2*gt23L*gtu32*SQR(Gt223) + 
-      gt22L*gtu33*SQR(Gt233) + 3*gt33L*gtu11*SQR(Gt313) + 
-      3*gt33L*gtu22*SQR(Gt323) + 3*gt33L*gtu33*SQR(Gt333);
-    
-    CCTK_REAL_VEC fac1 = IfThen(conformalMethod,-(khalf*INV(phiL)),1);
-    
-    CCTK_REAL_VEC cdphi1 = fac1*PDstandardNth1phi;
-    
-    CCTK_REAL_VEC cdphi2 = fac1*PDstandardNth2phi;
-    
-    CCTK_REAL_VEC cdphi3 = fac1*PDstandardNth3phi;
-    
-    CCTK_REAL_VEC fac2 = IfThen(conformalMethod,khalf*pow(phiL,-2),0);
-    
-    CCTK_REAL_VEC cdphi211 = -(fac1*(-PDstandardNth11phi + 
+    CCTK_REAL Rt33 = 4*(Gt123*gt13L*Gt323*gtu22 + Gt223*gt23L*Gt323*gtu22 
+      + Gt133*gt13L*Gt313*gtu31 + Gt233*gt23L*Gt313*gtu31 + 
+      Gt113*gt13L*Gt333*gtu31 + Gt133*gt13L*Gt323*gtu32 + 
+      Gt233*gt23L*Gt323*gtu32 + Gt123*gt13L*Gt333*gtu32 + 
+      Gt133*gt13L*Gt333*gtu33) + gtu21*(2*Gt212*Gt223*gt23L + 
+      4*Gt123*gt13L*Gt313 + 4*Gt223*gt23L*Gt313 + 4*Gt113*gt13L*Gt323 + 
+      4*Gt213*gt23L*Gt323 + 2*Gt123*Gt311*gt33L - PDstandardNth12gt33) + 
+      gtu31*(4*Gt213*gt23L*Gt333 + 2*Gt233*Gt312*gt33L + 6*Gt313*Gt333*gt33L 
+      - PDstandardNth13gt33) - gtu22*khalf*PDstandardNth22gt33 + 
+      gtu32*(4*Gt223*gt23L*Gt333 + 2*Gt123*Gt313*gt33L + 6*Gt323*Gt333*gt33L 
+      - PDstandardNth23gt33) - gtu33*khalf*PDstandardNth33gt33 + 
+      gt13L*PDstandardNth3Xt1 + gt23L*PDstandardNth3Xt2 + 
+      gt33L*(2*Gt213*Gt322*gtu21 + 6*Gt313*Gt323*gtu21 + 2*Gt123*Gt312*gtu22 
+      + 2*Gt133*Gt311*gtu31 + 2*Gt133*Gt312*gtu32 + 2*Gt133*Gt313*gtu33 + 
+      PDstandardNth3Xt3) + Gt113*gt13L*Xt1L + Gt213*gt23L*Xt1L + 
+      Gt313*gt33L*Xt1L + Gt123*gt13L*Xt2L + Gt223*gt23L*Xt2L + 
+      Gt323*gt33L*Xt2L + Gt133*gt13L*Xt3L + Gt333*gt33L*Xt3L + 
+      Gt233*(4*gt23L*Gt333*gtu33 + 2*Gt323*gt33L*gtu33 + gt23L*Xt3L) + 
+      gtu11*(2*Gt212*Gt213*gt23L + 4*Gt113*gt13L*Gt313 + 4*Gt213*gt23L*Gt313 
+      + 2*Gt113*Gt311*gt33L + 2*Gt213*Gt312*gt33L - khalf*PDstandardNth11gt33 
+      + gt11L*SQR(Gt113)) + 2*(Gt111*Gt113*gt13L*gtu11 + 
+      Gt113*gt12L*Gt213*gtu11 + Gt112*gt13L*Gt213*gtu11 + 
+      Gt113*Gt211*gt23L*gtu11 + Gt113*gt11L*Gt123*gtu21 + 
+      Gt112*Gt113*gt13L*gtu21 + Gt111*Gt123*gt13L*gtu21 + 
+      Gt123*gt12L*Gt213*gtu21 + Gt122*gt13L*Gt213*gtu21 + 
+      Gt113*gt12L*Gt223*gtu21 + Gt112*gt13L*Gt223*gtu21 + 
+      Gt213*Gt223*gt22L*gtu21 + Gt123*Gt211*gt23L*gtu21 + 
+      Gt113*Gt212*gt23L*gtu21 + Gt213*Gt222*gt23L*gtu21 + 
+      Gt113*Gt312*gt33L*gtu21 + Gt223*Gt312*gt33L*gtu21 + 
+      Gt112*Gt123*gt13L*gtu22 + Gt123*gt12L*Gt223*gtu22 + 
+      Gt122*gt13L*Gt223*gtu22 + Gt123*Gt212*gt23L*gtu22 + 
+      Gt222*Gt223*gt23L*gtu22 + Gt223*Gt322*gt33L*gtu22 + 
+      Gt113*gt11L*Gt133*gtu31 + Gt111*Gt133*gt13L*gtu31 + 
+      gt12L*Gt133*Gt213*gtu31 + Gt123*gt13L*Gt213*gtu31 + 
+      Gt113*gt12L*Gt233*gtu31 + Gt112*gt13L*Gt233*gtu31 + 
+      Gt213*gt22L*Gt233*gtu31 + Gt133*Gt211*gt23L*gtu31 + 
+      Gt113*Gt213*gt23L*gtu31 + Gt213*Gt223*gt23L*gtu31 + 
+      Gt212*Gt233*gt23L*gtu31 + Gt113*Gt313*gt33L*gtu31 + 
+      Gt213*Gt323*gt33L*gtu31 + gt11L*Gt123*Gt133*gtu32 + 
+      Gt113*Gt123*gt13L*gtu32 + Gt112*Gt133*gt13L*gtu32 + 
+      gt12L*Gt133*Gt223*gtu32 + Gt123*gt13L*Gt223*gtu32 + 
+      Gt123*gt12L*Gt233*gtu32 + Gt122*gt13L*Gt233*gtu32 + 
+      Gt223*gt22L*Gt233*gtu32 + Gt133*Gt212*gt23L*gtu32 + 
+      Gt123*Gt213*gt23L*gtu32 + Gt222*Gt233*gt23L*gtu32 + 
+      Gt233*Gt322*gt33L*gtu32 + Gt223*Gt323*gt33L*gtu32 + 
+      Gt113*Gt133*gt13L*gtu33 + gt12L*Gt133*Gt233*gtu33 + 
+      Gt123*gt13L*Gt233*gtu33 + Gt133*Gt213*gt23L*gtu33 + 
+      Gt223*Gt233*gt23L*gtu33 + gt13L*gtu31*SQR(Gt113)) + 
+      gt11L*gtu22*SQR(Gt123) + gt11L*gtu33*SQR(Gt133) + 
+      gt22L*gtu11*SQR(Gt213) + gt22L*gtu22*SQR(Gt223) + 
+      2*gt23L*gtu32*SQR(Gt223) + gt22L*gtu33*SQR(Gt233) + 
+      3*gt33L*gtu11*SQR(Gt313) + 3*gt33L*gtu22*SQR(Gt323) + 
+      3*gt33L*gtu33*SQR(Gt333);
+    
+    CCTK_REAL fac1 = IfThen(conformalMethod,-(khalf*INV(phiL)),1);
+    
+    CCTK_REAL cdphi1 = fac1*PDstandardNth1phi;
+    
+    CCTK_REAL cdphi2 = fac1*PDstandardNth2phi;
+    
+    CCTK_REAL cdphi3 = fac1*PDstandardNth3phi;
+    
+    CCTK_REAL fac2 = IfThen(conformalMethod,khalf*pow(phiL,-2),0);
+    
+    CCTK_REAL cdphi211 = -(fac1*(-PDstandardNth11phi + 
       Gt111*PDstandardNth1phi + Gt211*PDstandardNth2phi + 
       Gt311*PDstandardNth3phi)) + fac2*SQR(PDstandardNth1phi);
     
-    CCTK_REAL_VEC cdphi212 = fac2*PDstandardNth1phi*PDstandardNth2phi - 
+    CCTK_REAL cdphi212 = fac2*PDstandardNth1phi*PDstandardNth2phi - 
       fac1*(-PDstandardNth12phi + Gt112*PDstandardNth1phi + 
       Gt212*PDstandardNth2phi + Gt312*PDstandardNth3phi);
     
-    CCTK_REAL_VEC cdphi213 = fac2*PDstandardNth1phi*PDstandardNth3phi - 
+    CCTK_REAL cdphi213 = fac2*PDstandardNth1phi*PDstandardNth3phi - 
       fac1*(-PDstandardNth13phi + Gt113*PDstandardNth1phi + 
       Gt213*PDstandardNth2phi + Gt313*PDstandardNth3phi);
     
-    CCTK_REAL_VEC cdphi222 = -(fac1*(Gt122*PDstandardNth1phi - 
+    CCTK_REAL cdphi222 = -(fac1*(Gt122*PDstandardNth1phi - 
       PDstandardNth22phi + Gt222*PDstandardNth2phi + 
       Gt322*PDstandardNth3phi)) + fac2*SQR(PDstandardNth2phi);
     
-    CCTK_REAL_VEC cdphi223 = fac2*PDstandardNth2phi*PDstandardNth3phi - 
+    CCTK_REAL cdphi223 = fac2*PDstandardNth2phi*PDstandardNth3phi - 
       fac1*(Gt123*PDstandardNth1phi - PDstandardNth23phi + 
       Gt223*PDstandardNth2phi + Gt323*PDstandardNth3phi);
     
-    CCTK_REAL_VEC cdphi233 = -(fac1*(Gt133*PDstandardNth1phi + 
+    CCTK_REAL cdphi233 = -(fac1*(Gt133*PDstandardNth1phi + 
       Gt233*PDstandardNth2phi - PDstandardNth33phi + 
       Gt333*PDstandardNth3phi)) + fac2*SQR(PDstandardNth3phi);
     
-    CCTK_REAL_VEC Rphi11 = -2*(cdphi211 + 2*(-1 + gt11L*gtu11)*SQR(cdphi1) 
-      + gt11L*(cdphi211*gtu11 + 4*(cdphi1*(cdphi2*gtu21 + cdphi3*gtu31) + 
+    CCTK_REAL Rphi11 = -2*(cdphi211 + 2*(-1 + gt11L*gtu11)*SQR(cdphi1) + 
+      gt11L*(cdphi211*gtu11 + 4*(cdphi1*(cdphi2*gtu21 + cdphi3*gtu31) + 
       cdphi2*cdphi3*gtu32) + cdphi233*gtu33 + gtu22*(cdphi222 + 
       2*SQR(cdphi2)) + 2*(cdphi212*gtu21 + cdphi213*gtu31 + cdphi223*gtu32 + 
       gtu33*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi12 = -2*(cdphi212 + cdphi1*(cdphi2*(-2 + 
-      4*gt12L*gtu21) + 4*cdphi3*gt12L*gtu31) + gt12L*(cdphi211*gtu11 + 
-      4*cdphi2*cdphi3*gtu32 + 2*(cdphi212*gtu21 + cdphi213*gtu31 + 
-      cdphi223*gtu32 + gtu11*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2)) 
-      + gtu33*(cdphi233 + 2*SQR(cdphi3))));
+    CCTK_REAL Rphi12 = -2*(cdphi212 + cdphi1*(cdphi2*(-2 + 4*gt12L*gtu21) 
+      + 4*cdphi3*gt12L*gtu31) + gt12L*(cdphi211*gtu11 + 4*cdphi2*cdphi3*gtu32 
+      + 2*(cdphi212*gtu21 + cdphi213*gtu31 + cdphi223*gtu32 + 
+      gtu11*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2)) + gtu33*(cdphi233 
+      + 2*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi13 = -2*(cdphi213 + cdphi1*(4*cdphi2*gt13L*gtu21 + 
+    CCTK_REAL Rphi13 = -2*(cdphi213 + cdphi1*(4*cdphi2*gt13L*gtu21 + 
       cdphi3*(-2 + 4*gt13L*gtu31)) + gt13L*(cdphi211*gtu11 + 
       4*cdphi2*cdphi3*gtu32 + 2*(cdphi212*gtu21 + cdphi213*gtu31 + 
       cdphi223*gtu32 + gtu11*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2)) 
       + gtu33*(cdphi233 + 2*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi22 = -2*(cdphi222 + 2*(-1 + gt22L*gtu22)*SQR(cdphi2) 
-      + gt22L*(cdphi222*gtu22 + 4*(cdphi1*cdphi3*gtu31 + cdphi2*(cdphi1*gtu21 
-      + cdphi3*gtu32)) + cdphi233*gtu33 + gtu11*(cdphi211 + 2*SQR(cdphi1)) + 
+    CCTK_REAL Rphi22 = -2*(cdphi222 + 2*(-1 + gt22L*gtu22)*SQR(cdphi2) + 
+      gt22L*(cdphi222*gtu22 + 4*(cdphi1*cdphi3*gtu31 + cdphi2*(cdphi1*gtu21 + 
+      cdphi3*gtu32)) + cdphi233*gtu33 + gtu11*(cdphi211 + 2*SQR(cdphi1)) + 
       2*(cdphi212*gtu21 + cdphi213*gtu31 + cdphi223*gtu32 + 
       gtu33*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi23 = -2*(cdphi223 + cdphi2*(4*cdphi1*gt23L*gtu21 + 
+    CCTK_REAL Rphi23 = -2*(cdphi223 + cdphi2*(4*cdphi1*gt23L*gtu21 + 
       cdphi3*(-2 + 4*gt23L*gtu32)) + gt23L*(cdphi222*gtu22 + 
       4*cdphi1*cdphi3*gtu31 + gtu11*(cdphi211 + 2*SQR(cdphi1)) + 
       2*(cdphi212*gtu21 + cdphi213*gtu31 + cdphi223*gtu32 + 
       gtu22*SQR(cdphi2)) + gtu33*(cdphi233 + 2*SQR(cdphi3))));
     
-    CCTK_REAL_VEC Rphi33 = -2*(cdphi233 + gt33L*((4*cdphi1*cdphi2 + 
+    CCTK_REAL Rphi33 = -2*(cdphi233 + gt33L*((4*cdphi1*cdphi2 + 
       2*cdphi212)*gtu21 + 4*cdphi3*(cdphi1*gtu31 + cdphi2*gtu32) + 
       2*(cdphi213*gtu31 + cdphi223*gtu32) + cdphi233*gtu33 + gtu11*(cdphi211 
       + 2*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2))) + 2*(-1 + 
       gt33L*gtu33)*SQR(cdphi3));
     
-    CCTK_REAL_VEC e4phi = 
-      IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
+    CCTK_REAL e4phi = IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
     
-    CCTK_REAL_VEC em4phi = INV(e4phi);
+    CCTK_REAL em4phi = INV(e4phi);
     
-    CCTK_REAL_VEC gu11 = em4phi*gtu11;
+    CCTK_REAL gu11 = em4phi*gtu11;
     
-    CCTK_REAL_VEC gu21 = em4phi*gtu21;
+    CCTK_REAL gu21 = em4phi*gtu21;
     
-    CCTK_REAL_VEC gu31 = em4phi*gtu31;
+    CCTK_REAL gu31 = em4phi*gtu31;
     
-    CCTK_REAL_VEC gu22 = em4phi*gtu22;
+    CCTK_REAL gu22 = em4phi*gtu22;
     
-    CCTK_REAL_VEC gu32 = em4phi*gtu32;
+    CCTK_REAL gu32 = em4phi*gtu32;
     
-    CCTK_REAL_VEC gu33 = em4phi*gtu33;
+    CCTK_REAL gu33 = em4phi*gtu33;
     
-    CCTK_REAL_VEC R11 = Rphi11 + Rt11;
+    CCTK_REAL R11 = Rphi11 + Rt11;
     
-    CCTK_REAL_VEC R12 = Rphi12 + Rt12;
+    CCTK_REAL R12 = Rphi12 + Rt12;
     
-    CCTK_REAL_VEC R13 = Rphi13 + Rt13;
+    CCTK_REAL R13 = Rphi13 + Rt13;
     
-    CCTK_REAL_VEC R22 = Rphi22 + Rt22;
+    CCTK_REAL R22 = Rphi22 + Rt22;
     
-    CCTK_REAL_VEC R23 = Rphi23 + Rt23;
+    CCTK_REAL R23 = Rphi23 + Rt23;
     
-    CCTK_REAL_VEC R33 = Rphi33 + Rt33;
+    CCTK_REAL R33 = Rphi33 + Rt33;
     
-    CCTK_REAL_VEC trR = gu11*R11 + gu22*R22 + 2*(gu21*R12 + gu31*R13 + 
+    CCTK_REAL trR = gu11*R11 + gu22*R22 + 2*(gu21*R12 + gu31*R13 + 
       gu32*R23) + gu33*R33;
     
-    CCTK_REAL_VEC Atm11 = At11L*gtu11 + At12L*gtu21 + At13L*gtu31;
+    CCTK_REAL Atm11 = At11L*gtu11 + At12L*gtu21 + At13L*gtu31;
     
-    CCTK_REAL_VEC Atm21 = At11L*gtu21 + At12L*gtu22 + At13L*gtu32;
+    CCTK_REAL Atm21 = At11L*gtu21 + At12L*gtu22 + At13L*gtu32;
     
-    CCTK_REAL_VEC Atm31 = At11L*gtu31 + At12L*gtu32 + At13L*gtu33;
+    CCTK_REAL Atm31 = At11L*gtu31 + At12L*gtu32 + At13L*gtu33;
     
-    CCTK_REAL_VEC Atm12 = At12L*gtu11 + At22L*gtu21 + At23L*gtu31;
+    CCTK_REAL Atm12 = At12L*gtu11 + At22L*gtu21 + At23L*gtu31;
     
-    CCTK_REAL_VEC Atm22 = At12L*gtu21 + At22L*gtu22 + At23L*gtu32;
+    CCTK_REAL Atm22 = At12L*gtu21 + At22L*gtu22 + At23L*gtu32;
     
-    CCTK_REAL_VEC Atm32 = At12L*gtu31 + At22L*gtu32 + At23L*gtu33;
+    CCTK_REAL Atm32 = At12L*gtu31 + At22L*gtu32 + At23L*gtu33;
     
-    CCTK_REAL_VEC Atm13 = At13L*gtu11 + At23L*gtu21 + At33L*gtu31;
+    CCTK_REAL Atm13 = At13L*gtu11 + At23L*gtu21 + At33L*gtu31;
     
-    CCTK_REAL_VEC Atm23 = At13L*gtu21 + At23L*gtu22 + At33L*gtu32;
+    CCTK_REAL Atm23 = At13L*gtu21 + At23L*gtu22 + At33L*gtu32;
     
-    CCTK_REAL_VEC Atm33 = At13L*gtu31 + At23L*gtu32 + At33L*gtu33;
+    CCTK_REAL Atm33 = At13L*gtu31 + At23L*gtu32 + At33L*gtu33;
     
-    CCTK_REAL_VEC rho = pow(alphaL,-2)*(eTttL - 2*(beta2L*eTtyL + 
+    CCTK_REAL rho = pow(alphaL,-2)*(eTttL - 2*(beta2L*eTtyL + 
       beta3L*eTtzL) + 2*(beta1L*(-eTtxL + beta2L*eTxyL + beta3L*eTxzL) + 
       beta2L*beta3L*eTyzL) + eTxxL*SQR(beta1L) + eTyyL*SQR(beta2L) + 
       eTzzL*SQR(beta3L));
     
-    CCTK_REAL_VEC S1 = (-eTtxL + beta1L*eTxxL + beta2L*eTxyL + 
+    CCTK_REAL S1 = (-eTtxL + beta1L*eTxxL + beta2L*eTxyL + 
       beta3L*eTxzL)*INV(alphaL);
     
-    CCTK_REAL_VEC S2 = (-eTtyL + beta1L*eTxyL + beta2L*eTyyL + 
+    CCTK_REAL S2 = (-eTtyL + beta1L*eTxyL + beta2L*eTyyL + 
       beta3L*eTyzL)*INV(alphaL);
     
-    CCTK_REAL_VEC S3 = (-eTtzL + beta1L*eTxzL + beta2L*eTyzL + 
+    CCTK_REAL S3 = (-eTtzL + beta1L*eTxzL + beta2L*eTyzL + 
       beta3L*eTzzL)*INV(alphaL);
     
-    CCTK_REAL_VEC HL = -2.*(Atm12*Atm21 + Atm13*Atm31 + Atm23*Atm32) - 
+    CCTK_REAL HL = -2.*(Atm12*Atm21 + Atm13*Atm31 + Atm23*Atm32) - 
       50.26548245743669181540229413247204614715*rho + trR - 1.*(SQR(Atm11) + 
       SQR(Atm22) + SQR(Atm33)) + 
       0.6666666666666666666666666666666666666667*SQR(trKL);
     
-    CCTK_REAL_VEC M1L = -2.*((At12L*Gt211 + At13L*Gt311)*gtu11 + 
+    CCTK_REAL M1L = -2.*((At12L*Gt211 + At13L*Gt311)*gtu11 + 
       At11L*Gt123*gtu32) + At12L*((6.*cdphi1 - 1.*Gt111)*gtu21 - 
       3.*Gt213*gtu31 + 6.*(cdphi2*gtu22 + cdphi3*gtu32) - 1.*Gt233*gtu33) - 
       1.*((At22L*Gt212 + At12L*(Gt112 + Gt222) + At23L*Gt312 + 
@@ -944,17 +942,17 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
       gtu33*(-1.*(At23L*Gt213 + At33L*Gt313) + At13L*(6.*cdphi3 - 1.*Gt333) + 
       PDstandardNth3At13) - 25.13274122871834590770114706623602307358*S1;
     
-    CCTK_REAL_VEC M2L = At12L*((6.*cdphi1 - 1.*Gt111)*gtu11 - 
-      2.*Gt122*gtu22 + 6.*(cdphi2*gtu21 + cdphi3*gtu31) - 3.*Gt123*gtu32 - 
-      1.*Gt133*gtu33) + At22L*((6.*cdphi2 - 2.*Gt222)*gtu22 - 2.*Gt213*gtu31 
-      + 6.*cdphi3*gtu32 - 1.*Gt233*gtu33) + At23L*(-2.*Gt322*gtu22 - 
-      1.*Gt333*gtu33 + 6.*(cdphi1*gtu31 + cdphi2*gtu32 + cdphi3*gtu33)) - 
-      1.*((At11L*Gt112 + At22L*Gt211 + At12L*Gt212 + At23L*Gt311 + 
-      At13L*Gt312)*gtu11 + Gt122*(At11L*gtu21 + At13L*gtu32) + (At23L*Gt223 + 
-      At33L*Gt323)*gtu33 + At13L*(Gt112*gtu31 + Gt123*gtu33)) + 
-      gtu11*PDstandardNth1At12 + gtu21*(At22L*(6.*cdphi1 - 3.*Gt212) + 
-      At12L*(-3.*Gt112 - 1.*Gt222) - 3.*At23L*Gt312 - 1.*At13L*Gt322 + 
-      PDstandardNth1At22 + PDstandardNth2At12) + gtu22*PDstandardNth2At22 - 
+    CCTK_REAL M2L = At12L*((6.*cdphi1 - 1.*Gt111)*gtu11 - 2.*Gt122*gtu22 + 
+      6.*(cdphi2*gtu21 + cdphi3*gtu31) - 3.*Gt123*gtu32 - 1.*Gt133*gtu33) + 
+      At22L*((6.*cdphi2 - 2.*Gt222)*gtu22 - 2.*Gt213*gtu31 + 6.*cdphi3*gtu32 
+      - 1.*Gt233*gtu33) + At23L*(-2.*Gt322*gtu22 - 1.*Gt333*gtu33 + 
+      6.*(cdphi1*gtu31 + cdphi2*gtu32 + cdphi3*gtu33)) - 1.*((At11L*Gt112 + 
+      At22L*Gt211 + At12L*Gt212 + At23L*Gt311 + At13L*Gt312)*gtu11 + 
+      Gt122*(At11L*gtu21 + At13L*gtu32) + (At23L*Gt223 + At33L*Gt323)*gtu33 + 
+      At13L*(Gt112*gtu31 + Gt123*gtu33)) + gtu11*PDstandardNth1At12 + 
+      gtu21*(At22L*(6.*cdphi1 - 3.*Gt212) + At12L*(-3.*Gt112 - 1.*Gt222) - 
+      3.*At23L*Gt312 - 1.*At13L*Gt322 + PDstandardNth1At22 + 
+      PDstandardNth2At12) + gtu22*PDstandardNth2At22 - 
       0.6666666666666666666666666666666666666667*PDstandardNth2trK + 
       gtu31*(At12L*(-2.*Gt113 - 1.*Gt223) - 2.*At23L*Gt313 - 1.*(At11L*Gt123 
       + At23L*Gt212 + At33L*Gt312 + At13L*Gt323) + PDstandardNth1At23 + 
@@ -963,7 +961,7 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
       PDstandardNth3At22) + gtu33*PDstandardNth3At23 - 
       25.13274122871834590770114706623602307358*S2;
     
-    CCTK_REAL_VEC M3L = -1.*((At11L*Gt113 + At23L*Gt211 + At12L*Gt213 + 
+    CCTK_REAL M3L = -1.*((At11L*Gt113 + At23L*Gt211 + At12L*Gt213 + 
       At33L*Gt311)*gtu11 + (At22L*Gt223 + At33L*Gt322 + At23L*Gt323)*gtu22 + 
       At11L*Gt133*gtu31 + At12L*(Gt113*gtu21 + Gt123*gtu22 + Gt133*gtu32)) + 
       At13L*((6.*cdphi1 - 1.*(Gt111 + Gt313))*gtu11 - 1.*Gt122*gtu22 + 
@@ -981,37 +979,36 @@ static void ML_BSSN_O8_constraints_Body(cGH const * restrict const cctkGH, int c
       0.6666666666666666666666666666666666666667*PDstandardNth3trK - 
       25.13274122871834590770114706623602307358*S3;
     
-    CCTK_REAL_VEC cSL = Log(detgt);
+    CCTK_REAL cSL = Log(detgt);
     
-    CCTK_REAL_VEC cXt1L = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
+    CCTK_REAL cXt1L = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
       Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33 - Xt1L;
     
-    CCTK_REAL_VEC cXt2L = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
+    CCTK_REAL cXt2L = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
       Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33 - Xt2L;
     
-    CCTK_REAL_VEC cXt3L = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
+    CCTK_REAL cXt3L = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
       Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33 - Xt3L;
     
-    CCTK_REAL_VEC cAL = At11L*gtu11 + At22L*gtu22 + 2*(At12L*gtu21 + 
+    CCTK_REAL cAL = At11L*gtu11 + At22L*gtu22 + 2*(At12L*gtu21 + 
       At13L*gtu31 + At23L*gtu32) + At33L*gtu33;
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(cA[index],cAL);
-    vec_store_nta(cS[index],cSL);
-    vec_store_nta(cXt1[index],cXt1L);
-    vec_store_nta(cXt2[index],cXt2L);
-    vec_store_nta(cXt3[index],cXt3L);
-    vec_store_nta(H[index],HL);
-    vec_store_nta(M1[index],M1L);
-    vec_store_nta(M2[index],M2L);
-    vec_store_nta(M3[index],M3L);
-  i += CCTK_REAL_VEC_SIZE-1;
+    cA[index] = cAL;
+    cS[index] = cSL;
+    cXt1[index] = cXt1L;
+    cXt2[index] = cXt2L;
+    cXt3[index] = cXt3L;
+    H[index] = HL;
+    M1[index] = M1L;
+    M2[index] = M2L;
+    M3[index] = M3L;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_constraints);
 }
 
-extern "C" void ML_BSSN_O8_constraints(CCTK_ARGUMENTS)
+void ML_BSSN_O8_constraints(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_constraints_boundary.cc b/ML_BSSN_O8/src/ML_BSSN_O8_constraints_boundary.c
index a686828..1e70cbe 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_constraints_boundary.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_constraints_boundary.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_constraints_boundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_constraints_boundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -103,41 +102,40 @@ static void ML_BSSN_O8_constraints_boundary_Body(cGH const * restrict const cctk
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC HL = 0;
+    CCTK_REAL HL = 0;
     
-    CCTK_REAL_VEC M1L = 0;
+    CCTK_REAL M1L = 0;
     
-    CCTK_REAL_VEC M2L = 0;
+    CCTK_REAL M2L = 0;
     
-    CCTK_REAL_VEC M3L = 0;
+    CCTK_REAL M3L = 0;
     
-    CCTK_REAL_VEC cSL = 0;
+    CCTK_REAL cSL = 0;
     
-    CCTK_REAL_VEC cXt1L = 0;
+    CCTK_REAL cXt1L = 0;
     
-    CCTK_REAL_VEC cXt2L = 0;
+    CCTK_REAL cXt2L = 0;
     
-    CCTK_REAL_VEC cXt3L = 0;
+    CCTK_REAL cXt3L = 0;
     
-    CCTK_REAL_VEC cAL = 0;
+    CCTK_REAL cAL = 0;
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(cA[index],cAL);
-    vec_store_nta(cS[index],cSL);
-    vec_store_nta(cXt1[index],cXt1L);
-    vec_store_nta(cXt2[index],cXt2L);
-    vec_store_nta(cXt3[index],cXt3L);
-    vec_store_nta(H[index],HL);
-    vec_store_nta(M1[index],M1L);
-    vec_store_nta(M2[index],M2L);
-    vec_store_nta(M3[index],M3L);
-  i += CCTK_REAL_VEC_SIZE-1;
+    cA[index] = cAL;
+    cS[index] = cSL;
+    cXt1[index] = cXt1L;
+    cXt2[index] = cXt2L;
+    cXt3[index] = cXt3L;
+    H[index] = HL;
+    M1[index] = M1L;
+    M2[index] = M2L;
+    M3[index] = M3L;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_constraints_boundary);
 }
 
-extern "C" void ML_BSSN_O8_constraints_boundary(CCTK_ARGUMENTS)
+void ML_BSSN_O8_constraints_boundary(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBase.cc b/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBase.c
index ab7e2d8..b672c39 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBase.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBase.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_convertFromADMBase_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_convertFromADMBase_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -97,123 +96,122 @@ static void ML_BSSN_O8_convertFromADMBase_Body(cGH const * restrict const cctkGH
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  alpL = vec_load(alp[index]);
-    CCTK_REAL_VEC  betaxL = vec_load(betax[index]);
-    CCTK_REAL_VEC  betayL = vec_load(betay[index]);
-    CCTK_REAL_VEC  betazL = vec_load(betaz[index]);
-    CCTK_REAL_VEC  gxxL = vec_load(gxx[index]);
-    CCTK_REAL_VEC  gxyL = vec_load(gxy[index]);
-    CCTK_REAL_VEC  gxzL = vec_load(gxz[index]);
-    CCTK_REAL_VEC  gyyL = vec_load(gyy[index]);
-    CCTK_REAL_VEC  gyzL = vec_load(gyz[index]);
-    CCTK_REAL_VEC  gzzL = vec_load(gzz[index]);
-    CCTK_REAL_VEC  kxxL = vec_load(kxx[index]);
-    CCTK_REAL_VEC  kxyL = vec_load(kxy[index]);
-    CCTK_REAL_VEC  kxzL = vec_load(kxz[index]);
-    CCTK_REAL_VEC  kyyL = vec_load(kyy[index]);
-    CCTK_REAL_VEC  kyzL = vec_load(kyz[index]);
-    CCTK_REAL_VEC  kzzL = vec_load(kzz[index]);
-    CCTK_REAL_VEC  phiL = vec_load(phi[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
+    CCTK_REAL  alpL = alp[index];
+    CCTK_REAL  betaxL = betax[index];
+    CCTK_REAL  betayL = betay[index];
+    CCTK_REAL  betazL = betaz[index];
+    CCTK_REAL  gxxL = gxx[index];
+    CCTK_REAL  gxyL = gxy[index];
+    CCTK_REAL  gxzL = gxz[index];
+    CCTK_REAL  gyyL = gyy[index];
+    CCTK_REAL  gyzL = gyz[index];
+    CCTK_REAL  gzzL = gzz[index];
+    CCTK_REAL  kxxL = kxx[index];
+    CCTK_REAL  kxyL = kxy[index];
+    CCTK_REAL  kxzL = kxz[index];
+    CCTK_REAL  kyyL = kyy[index];
+    CCTK_REAL  kyzL = kyz[index];
+    CCTK_REAL  kzzL = kzz[index];
+    CCTK_REAL  phiL = phi[index];
+    CCTK_REAL  trKL = trK[index];
     
     /* Include user supplied include files */
     
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC g11 = gxxL;
+    CCTK_REAL g11 = gxxL;
     
-    CCTK_REAL_VEC g12 = gxyL;
+    CCTK_REAL g12 = gxyL;
     
-    CCTK_REAL_VEC g13 = gxzL;
+    CCTK_REAL g13 = gxzL;
     
-    CCTK_REAL_VEC g22 = gyyL;
+    CCTK_REAL g22 = gyyL;
     
-    CCTK_REAL_VEC g23 = gyzL;
+    CCTK_REAL g23 = gyzL;
     
-    CCTK_REAL_VEC g33 = gzzL;
+    CCTK_REAL g33 = gzzL;
     
-    CCTK_REAL_VEC detg = 2*g12*g13*g23 + g33*(g11*g22 - SQR(g12)) - 
+    CCTK_REAL detg = 2*g12*g13*g23 + g33*(g11*g22 - SQR(g12)) - 
       g22*SQR(g13) - g11*SQR(g23);
     
-    CCTK_REAL_VEC gu11 = INV(detg)*(g22*g33 - SQR(g23));
+    CCTK_REAL gu11 = INV(detg)*(g22*g33 - SQR(g23));
     
-    CCTK_REAL_VEC gu21 = (g13*g23 - g12*g33)*INV(detg);
+    CCTK_REAL gu21 = (g13*g23 - g12*g33)*INV(detg);
     
-    CCTK_REAL_VEC gu31 = (-(g13*g22) + g12*g23)*INV(detg);
+    CCTK_REAL gu31 = (-(g13*g22) + g12*g23)*INV(detg);
     
-    CCTK_REAL_VEC gu22 = INV(detg)*(g11*g33 - SQR(g13));
+    CCTK_REAL gu22 = INV(detg)*(g11*g33 - SQR(g13));
     
-    CCTK_REAL_VEC gu32 = (g12*g13 - g11*g23)*INV(detg);
+    CCTK_REAL gu32 = (g12*g13 - g11*g23)*INV(detg);
     
-    CCTK_REAL_VEC gu33 = INV(detg)*(g11*g22 - SQR(g12));
+    CCTK_REAL gu33 = INV(detg)*(g11*g22 - SQR(g12));
     
     phiL = 
       IfThen(conformalMethod,pow(detg,-0.16666666666666666),Log(detg)/12.);
     
-    CCTK_REAL_VEC em4phi = IfThen(conformalMethod,SQR(phiL),exp(-4*phiL));
+    CCTK_REAL em4phi = IfThen(conformalMethod,SQR(phiL),exp(-4*phiL));
     
-    CCTK_REAL_VEC gt11L = em4phi*g11;
+    CCTK_REAL gt11L = em4phi*g11;
     
-    CCTK_REAL_VEC gt12L = em4phi*g12;
+    CCTK_REAL gt12L = em4phi*g12;
     
-    CCTK_REAL_VEC gt13L = em4phi*g13;
+    CCTK_REAL gt13L = em4phi*g13;
     
-    CCTK_REAL_VEC gt22L = em4phi*g22;
+    CCTK_REAL gt22L = em4phi*g22;
     
-    CCTK_REAL_VEC gt23L = em4phi*g23;
+    CCTK_REAL gt23L = em4phi*g23;
     
-    CCTK_REAL_VEC gt33L = em4phi*g33;
+    CCTK_REAL gt33L = em4phi*g33;
     
     trKL = gu11*kxxL + gu22*kyyL + 2*(gu21*kxyL + gu31*kxzL + gu32*kyzL) + 
       gu33*kzzL;
     
-    CCTK_REAL_VEC At11L = em4phi*(kxxL - g11*kthird*trKL);
+    CCTK_REAL At11L = em4phi*(kxxL - g11*kthird*trKL);
     
-    CCTK_REAL_VEC At12L = em4phi*(kxyL - g12*kthird*trKL);
+    CCTK_REAL At12L = em4phi*(kxyL - g12*kthird*trKL);
     
-    CCTK_REAL_VEC At13L = em4phi*(kxzL - g13*kthird*trKL);
+    CCTK_REAL At13L = em4phi*(kxzL - g13*kthird*trKL);
     
-    CCTK_REAL_VEC At22L = em4phi*(kyyL - g22*kthird*trKL);
+    CCTK_REAL At22L = em4phi*(kyyL - g22*kthird*trKL);
     
-    CCTK_REAL_VEC At23L = em4phi*(kyzL - g23*kthird*trKL);
+    CCTK_REAL At23L = em4phi*(kyzL - g23*kthird*trKL);
     
-    CCTK_REAL_VEC At33L = em4phi*(kzzL - g33*kthird*trKL);
+    CCTK_REAL At33L = em4phi*(kzzL - g33*kthird*trKL);
     
-    CCTK_REAL_VEC alphaL = alpL;
+    CCTK_REAL alphaL = alpL;
     
-    CCTK_REAL_VEC beta1L = betaxL;
+    CCTK_REAL beta1L = betaxL;
     
-    CCTK_REAL_VEC beta2L = betayL;
+    CCTK_REAL beta2L = betayL;
     
-    CCTK_REAL_VEC beta3L = betazL;
+    CCTK_REAL beta3L = betazL;
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(alpha[index],alphaL);
-    vec_store_nta(At11[index],At11L);
-    vec_store_nta(At12[index],At12L);
-    vec_store_nta(At13[index],At13L);
-    vec_store_nta(At22[index],At22L);
-    vec_store_nta(At23[index],At23L);
-    vec_store_nta(At33[index],At33L);
-    vec_store_nta(beta1[index],beta1L);
-    vec_store_nta(beta2[index],beta2L);
-    vec_store_nta(beta3[index],beta3L);
-    vec_store_nta(gt11[index],gt11L);
-    vec_store_nta(gt12[index],gt12L);
-    vec_store_nta(gt13[index],gt13L);
-    vec_store_nta(gt22[index],gt22L);
-    vec_store_nta(gt23[index],gt23L);
-    vec_store_nta(gt33[index],gt33L);
-    vec_store_nta(phi[index],phiL);
-    vec_store_nta(trK[index],trKL);
-  i += CCTK_REAL_VEC_SIZE-1;
+    alpha[index] = alphaL;
+    At11[index] = At11L;
+    At12[index] = At12L;
+    At13[index] = At13L;
+    At22[index] = At22L;
+    At23[index] = At23L;
+    At33[index] = At33L;
+    beta1[index] = beta1L;
+    beta2[index] = beta2L;
+    beta3[index] = beta3L;
+    gt11[index] = gt11L;
+    gt12[index] = gt12L;
+    gt13[index] = gt13L;
+    gt22[index] = gt22L;
+    gt23[index] = gt23L;
+    gt33[index] = gt33L;
+    phi[index] = phiL;
+    trK[index] = trKL;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_convertFromADMBase);
 }
 
-extern "C" void ML_BSSN_O8_convertFromADMBase(CCTK_ARGUMENTS)
+void ML_BSSN_O8_convertFromADMBase(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.cc b/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.c
index 2122692..e97a941 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -95,111 +94,111 @@ static void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const c
     // int index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
     /* Declare derivatives */
-    // CCTK_REAL_VEC PDupwindNthAnti1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt11 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt12 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt13 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt22 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt23 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth1gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth2gt33 = INITVALUE;
-    // CCTK_REAL_VEC PDstandardNth3gt33 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta3 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt11 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt12 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt13 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt22 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt23 = INITVALUE;
+    // CCTK_REAL PDstandardNth1gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth2gt33 = INITVALUE;
+    // CCTK_REAL PDstandardNth3gt33 = INITVALUE;
     
     /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  dtalpL = vec_load(dtalp[index]);
-    CCTK_REAL_VEC  dtbetaxL = vec_load(dtbetax[index]);
-    CCTK_REAL_VEC  dtbetayL = vec_load(dtbetay[index]);
-    CCTK_REAL_VEC  dtbetazL = vec_load(dtbetaz[index]);
-    CCTK_REAL_VEC  gt11L = vec_load(gt11[index]);
-    CCTK_REAL_VEC  gt12L = vec_load(gt12[index]);
-    CCTK_REAL_VEC  gt13L = vec_load(gt13[index]);
-    CCTK_REAL_VEC  gt22L = vec_load(gt22[index]);
-    CCTK_REAL_VEC  gt23L = vec_load(gt23[index]);
-    CCTK_REAL_VEC  gt33L = vec_load(gt33[index]);
-    CCTK_REAL_VEC  rL = vec_load(r[index]);
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  dtalpL = dtalp[index];
+    CCTK_REAL  dtbetaxL = dtbetax[index];
+    CCTK_REAL  dtbetayL = dtbetay[index];
+    CCTK_REAL  dtbetazL = dtbetaz[index];
+    CCTK_REAL  gt11L = gt11[index];
+    CCTK_REAL  gt12L = gt12[index];
+    CCTK_REAL  gt13L = gt13[index];
+    CCTK_REAL  gt22L = gt22[index];
+    CCTK_REAL  gt23L = gt23[index];
+    CCTK_REAL  gt33L = gt33[index];
+    CCTK_REAL  rL = r[index];
     
     /* Include user supplied include files */
     
     /* Precompute derivatives */
-    CCTK_REAL_VEC const PDupwindNthAnti1alpha = PDupwindNthAnti1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1alpha = PDupwindNthSymm1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2alpha = PDupwindNthAnti2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2alpha = PDupwindNthSymm2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3alpha = PDupwindNthAnti3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3alpha = PDupwindNthSymm3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta1 = PDupwindNthAnti1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta1 = PDupwindNthSymm1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta1 = PDupwindNthAnti2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta1 = PDupwindNthSymm2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta1 = PDupwindNthAnti3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta1 = PDupwindNthSymm3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta2 = PDupwindNthAnti1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta2 = PDupwindNthSymm1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta2 = PDupwindNthAnti2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta2 = PDupwindNthSymm2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta2 = PDupwindNthAnti3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta2 = PDupwindNthSymm3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta3 = PDupwindNthAnti1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta3 = PDupwindNthSymm1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta3 = PDupwindNthAnti2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta3 = PDupwindNthSymm2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta3 = PDupwindNthAnti3(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta3 = PDupwindNthSymm3(beta3, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt12 = PDstandardNth1(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt12 = PDstandardNth2(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt12 = PDstandardNth3(gt12, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt13 = PDstandardNth1(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt13 = PDstandardNth2(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt13 = PDstandardNth3(gt13, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt22 = PDstandardNth1(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt22 = PDstandardNth2(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt22 = PDstandardNth3(gt22, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt23 = PDstandardNth1(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt23 = PDstandardNth2(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt23 = PDstandardNth3(gt23, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth1gt33 = PDstandardNth1(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
-    CCTK_REAL_VEC const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1alpha = PDupwindNthAnti1(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1alpha = PDupwindNthSymm1(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2alpha = PDupwindNthAnti2(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2alpha = PDupwindNthSymm2(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3alpha = PDupwindNthAnti3(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3alpha = PDupwindNthSymm3(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta1 = PDupwindNthAnti1(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta1 = PDupwindNthSymm1(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta1 = PDupwindNthAnti2(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta1 = PDupwindNthSymm2(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta1 = PDupwindNthAnti3(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta1 = PDupwindNthSymm3(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta2 = PDupwindNthAnti1(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta2 = PDupwindNthSymm1(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta2 = PDupwindNthAnti2(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta2 = PDupwindNthSymm2(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta2 = PDupwindNthAnti3(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta2 = PDupwindNthSymm3(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta3 = PDupwindNthAnti1(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta3 = PDupwindNthSymm1(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta3 = PDupwindNthAnti2(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta3 = PDupwindNthSymm2(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta3 = PDupwindNthAnti3(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta3 = PDupwindNthSymm3(beta3, i, j, k);
+    CCTK_REAL const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
+    CCTK_REAL const PDstandardNth1gt12 = PDstandardNth1(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth2gt12 = PDstandardNth2(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth3gt12 = PDstandardNth3(gt12, i, j, k);
+    CCTK_REAL const PDstandardNth1gt13 = PDstandardNth1(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth2gt13 = PDstandardNth2(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth3gt13 = PDstandardNth3(gt13, i, j, k);
+    CCTK_REAL const PDstandardNth1gt22 = PDstandardNth1(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth2gt22 = PDstandardNth2(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth3gt22 = PDstandardNth3(gt22, i, j, k);
+    CCTK_REAL const PDstandardNth1gt23 = PDstandardNth1(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth2gt23 = PDstandardNth2(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth3gt23 = PDstandardNth3(gt23, i, j, k);
+    CCTK_REAL const PDstandardNth1gt33 = PDstandardNth1(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
+    CCTK_REAL const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
     
     /* Calculate temporaries and grid functions */
     int dir1 = Sign(beta1L);
@@ -208,102 +207,102 @@ static void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const c
     
     int dir3 = Sign(beta3L);
     
-    CCTK_REAL_VEC detgt = 1;
+    CCTK_REAL detgt = 1;
     
-    CCTK_REAL_VEC gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
+    CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
     
-    CCTK_REAL_VEC gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
+    CCTK_REAL gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
+    CCTK_REAL gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
+    CCTK_REAL gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
     
-    CCTK_REAL_VEC gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
+    CCTK_REAL gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
+    CCTK_REAL gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
     
-    CCTK_REAL_VEC Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
+    CCTK_REAL Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
       2*(gtu21*PDstandardNth1gt12 + gtu31*PDstandardNth1gt13) - 
       gtu21*PDstandardNth2gt11 - gtu31*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
+    CCTK_REAL Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
       2*(gtu22*PDstandardNth1gt12 + gtu32*PDstandardNth1gt13) - 
       gtu22*PDstandardNth2gt11 - gtu32*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
+    CCTK_REAL Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
       2*(gtu32*PDstandardNth1gt12 + gtu33*PDstandardNth1gt13) - 
       gtu32*PDstandardNth2gt11 - gtu33*PDstandardNth3gt11);
     
-    CCTK_REAL_VEC Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
+    CCTK_REAL Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
       gtu11*PDstandardNth2gt11 + gtu31*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
+    CCTK_REAL Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
       gtu21*PDstandardNth2gt11 + gtu32*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
+    CCTK_REAL Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
       gtu31*PDstandardNth2gt11 + gtu33*(PDstandardNth1gt23 + 
       PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
+    CCTK_REAL Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
       gtu11*PDstandardNth3gt11 + gtu21*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
+    CCTK_REAL Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
       gtu21*PDstandardNth3gt11 + gtu22*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
+    CCTK_REAL Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
       gtu31*PDstandardNth3gt11 + gtu32*(PDstandardNth1gt23 - 
       PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL_VEC Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu21*PDstandardNth2gt22 + 
       gtu31*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu22*PDstandardNth2gt22 + 
       gtu32*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
+    CCTK_REAL Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
       2*PDstandardNth2gt12) + gtu32*PDstandardNth2gt22 + 
       gtu33*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL_VEC Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
+    CCTK_REAL Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
       gtu11*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu21*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
+    CCTK_REAL Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
       gtu21*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu22*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
+    CCTK_REAL Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
       gtu31*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
       gtu32*PDstandardNth3gt22);
     
-    CCTK_REAL_VEC Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
+    CCTK_REAL Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
       gtu21*PDstandardNth2gt33 + 2*gtu11*PDstandardNth3gt13 + 
       2*gtu21*PDstandardNth3gt23 + gtu31*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
+    CCTK_REAL Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
       gtu22*PDstandardNth2gt33 + 2*gtu21*PDstandardNth3gt13 + 
       2*gtu22*PDstandardNth3gt23 + gtu32*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
+    CCTK_REAL Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
       gtu32*PDstandardNth2gt33 + 2*gtu31*PDstandardNth3gt13 + 
       2*gtu32*PDstandardNth3gt23 + gtu33*PDstandardNth3gt33);
     
-    CCTK_REAL_VEC Xt1L = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
+    CCTK_REAL Xt1L = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
       Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33;
     
-    CCTK_REAL_VEC Xt2L = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
+    CCTK_REAL Xt2L = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
       Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33;
     
-    CCTK_REAL_VEC Xt3L = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
+    CCTK_REAL Xt3L = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
       Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
     
-    CCTK_REAL_VEC AL = 12*IfThen(LapseACoeff != 
+    CCTK_REAL AL = 12*IfThen(LapseACoeff != 
       0,-(dtalpL*INV(harmonicF)*pow(alphaL,-harmonicN)),0) + 
       IfThen(LapseACoeff != 0,(-dtalpL + 
       LapseAdvectionCoeff*(beta1L*PDupwindNthAnti1alpha + 
@@ -327,10 +326,10 @@ static void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const c
       LapseAdvectionCoeff*(beta3L*PDupwindNthAnti3alpha + 
       PDupwindNthSymm3alpha*Abs(beta3L)))*INV(harmonicF)*pow(alphaL,-harmonicN),0);
     
-    CCTK_REAL_VEC theta = fmin(1,exp(1 - 
+    CCTK_REAL theta = fmin(1,exp(1 - 
       rL*INV(SpatialShiftGammaCoeffRadius)));
     
-    CCTK_REAL_VEC B1L = 12*IfThen(ShiftBCoeff*ShiftGammaCoeff != 
+    CCTK_REAL B1L = 12*IfThen(ShiftBCoeff*ShiftGammaCoeff != 
       0,dtbetaxL*INV(ShiftGammaCoeff)*INV(theta),0) + 
       IfThen(ShiftBCoeff*ShiftGammaCoeff != 0,(dtbetaxL - 
       beta1L*PDupwindNthAnti1beta1*ShiftAdvectionCoeff - 
@@ -354,7 +353,7 @@ static void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const c
       beta3L*PDupwindNthAnti3beta1*ShiftAdvectionCoeff - 
       PDupwindNthSymm3beta1*ShiftAdvectionCoeff*Abs(beta3L))*INV(ShiftGammaCoeff)*INV(theta),0);
     
-    CCTK_REAL_VEC B2L = 12*IfThen(ShiftBCoeff*ShiftGammaCoeff != 
+    CCTK_REAL B2L = 12*IfThen(ShiftBCoeff*ShiftGammaCoeff != 
       0,dtbetayL*INV(ShiftGammaCoeff)*INV(theta),0) + 
       IfThen(ShiftBCoeff*ShiftGammaCoeff != 0,(dtbetayL - 
       beta1L*PDupwindNthAnti1beta2*ShiftAdvectionCoeff - 
@@ -378,7 +377,7 @@ static void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const c
       beta3L*PDupwindNthAnti3beta2*ShiftAdvectionCoeff - 
       PDupwindNthSymm3beta2*ShiftAdvectionCoeff*Abs(beta3L))*INV(ShiftGammaCoeff)*INV(theta),0);
     
-    CCTK_REAL_VEC B3L = 12*IfThen(ShiftBCoeff*ShiftGammaCoeff != 
+    CCTK_REAL B3L = 12*IfThen(ShiftBCoeff*ShiftGammaCoeff != 
       0,dtbetazL*INV(ShiftGammaCoeff)*INV(theta),0) + 
       IfThen(ShiftBCoeff*ShiftGammaCoeff != 0,(dtbetazL - 
       beta1L*PDupwindNthAnti1beta3*ShiftAdvectionCoeff - 
@@ -404,19 +403,18 @@ static void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const c
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(A[index],AL);
-    vec_store_nta(B1[index],B1L);
-    vec_store_nta(B2[index],B2L);
-    vec_store_nta(B3[index],B3L);
-    vec_store_nta(Xt1[index],Xt1L);
-    vec_store_nta(Xt2[index],Xt2L);
-    vec_store_nta(Xt3[index],Xt3L);
-  i += CCTK_REAL_VEC_SIZE-1;
+    A[index] = AL;
+    B1[index] = B1L;
+    B2[index] = B2L;
+    B3[index] = B3L;
+    Xt1[index] = Xt1L;
+    Xt2[index] = Xt2L;
+    Xt3[index] = Xt3L;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_convertFromADMBaseGamma);
 }
 
-extern "C" void ML_BSSN_O8_convertFromADMBaseGamma(CCTK_ARGUMENTS)
+void ML_BSSN_O8_convertFromADMBaseGamma(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.cc b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.c
index e2e27d2..ecbf6bc 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_convertToADMBase_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_convertToADMBase_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -97,38 +96,37 @@ static void ML_BSSN_O8_convertToADMBase_Body(cGH const * restrict const cctkGH,
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  At11L = vec_load(At11[index]);
-    CCTK_REAL_VEC  At12L = vec_load(At12[index]);
-    CCTK_REAL_VEC  At13L = vec_load(At13[index]);
-    CCTK_REAL_VEC  At22L = vec_load(At22[index]);
-    CCTK_REAL_VEC  At23L = vec_load(At23[index]);
-    CCTK_REAL_VEC  At33L = vec_load(At33[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  gt11L = vec_load(gt11[index]);
-    CCTK_REAL_VEC  gt12L = vec_load(gt12[index]);
-    CCTK_REAL_VEC  gt13L = vec_load(gt13[index]);
-    CCTK_REAL_VEC  gt22L = vec_load(gt22[index]);
-    CCTK_REAL_VEC  gt23L = vec_load(gt23[index]);
-    CCTK_REAL_VEC  gt33L = vec_load(gt33[index]);
-    CCTK_REAL_VEC  gxxL = vec_load(gxx[index]);
-    CCTK_REAL_VEC  gxyL = vec_load(gxy[index]);
-    CCTK_REAL_VEC  gxzL = vec_load(gxz[index]);
-    CCTK_REAL_VEC  gyyL = vec_load(gyy[index]);
-    CCTK_REAL_VEC  gyzL = vec_load(gyz[index]);
-    CCTK_REAL_VEC  gzzL = vec_load(gzz[index]);
-    CCTK_REAL_VEC  phiL = vec_load(phi[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  At11L = At11[index];
+    CCTK_REAL  At12L = At12[index];
+    CCTK_REAL  At13L = At13[index];
+    CCTK_REAL  At22L = At22[index];
+    CCTK_REAL  At23L = At23[index];
+    CCTK_REAL  At33L = At33[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  gt11L = gt11[index];
+    CCTK_REAL  gt12L = gt12[index];
+    CCTK_REAL  gt13L = gt13[index];
+    CCTK_REAL  gt22L = gt22[index];
+    CCTK_REAL  gt23L = gt23[index];
+    CCTK_REAL  gt33L = gt33[index];
+    CCTK_REAL  gxxL = gxx[index];
+    CCTK_REAL  gxyL = gxy[index];
+    CCTK_REAL  gxzL = gxz[index];
+    CCTK_REAL  gyyL = gyy[index];
+    CCTK_REAL  gyzL = gyz[index];
+    CCTK_REAL  gzzL = gzz[index];
+    CCTK_REAL  phiL = phi[index];
+    CCTK_REAL  trKL = trK[index];
     
     /* Include user supplied include files */
     
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC e4phi = 
-      IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
+    CCTK_REAL e4phi = IfThen(conformalMethod,pow(phiL,-2),exp(4*phiL));
     
     gxxL = e4phi*gt11L;
     
@@ -142,50 +140,49 @@ static void ML_BSSN_O8_convertToADMBase_Body(cGH const * restrict const cctkGH,
     
     gzzL = e4phi*gt33L;
     
-    CCTK_REAL_VEC kxxL = At11L*e4phi + gxxL*kthird*trKL;
+    CCTK_REAL kxxL = At11L*e4phi + gxxL*kthird*trKL;
     
-    CCTK_REAL_VEC kxyL = At12L*e4phi + gxyL*kthird*trKL;
+    CCTK_REAL kxyL = At12L*e4phi + gxyL*kthird*trKL;
     
-    CCTK_REAL_VEC kxzL = At13L*e4phi + gxzL*kthird*trKL;
+    CCTK_REAL kxzL = At13L*e4phi + gxzL*kthird*trKL;
     
-    CCTK_REAL_VEC kyyL = At22L*e4phi + gyyL*kthird*trKL;
+    CCTK_REAL kyyL = At22L*e4phi + gyyL*kthird*trKL;
     
-    CCTK_REAL_VEC kyzL = At23L*e4phi + gyzL*kthird*trKL;
+    CCTK_REAL kyzL = At23L*e4phi + gyzL*kthird*trKL;
     
-    CCTK_REAL_VEC kzzL = At33L*e4phi + gzzL*kthird*trKL;
+    CCTK_REAL kzzL = At33L*e4phi + gzzL*kthird*trKL;
     
-    CCTK_REAL_VEC alpL = alphaL;
+    CCTK_REAL alpL = alphaL;
     
-    CCTK_REAL_VEC betaxL = beta1L;
+    CCTK_REAL betaxL = beta1L;
     
-    CCTK_REAL_VEC betayL = beta2L;
+    CCTK_REAL betayL = beta2L;
     
-    CCTK_REAL_VEC betazL = beta3L;
+    CCTK_REAL betazL = beta3L;
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(alp[index],alpL);
-    vec_store_nta(betax[index],betaxL);
-    vec_store_nta(betay[index],betayL);
-    vec_store_nta(betaz[index],betazL);
-    vec_store_nta(gxx[index],gxxL);
-    vec_store_nta(gxy[index],gxyL);
-    vec_store_nta(gxz[index],gxzL);
-    vec_store_nta(gyy[index],gyyL);
-    vec_store_nta(gyz[index],gyzL);
-    vec_store_nta(gzz[index],gzzL);
-    vec_store_nta(kxx[index],kxxL);
-    vec_store_nta(kxy[index],kxyL);
-    vec_store_nta(kxz[index],kxzL);
-    vec_store_nta(kyy[index],kyyL);
-    vec_store_nta(kyz[index],kyzL);
-    vec_store_nta(kzz[index],kzzL);
-  i += CCTK_REAL_VEC_SIZE-1;
+    alp[index] = alpL;
+    betax[index] = betaxL;
+    betay[index] = betayL;
+    betaz[index] = betazL;
+    gxx[index] = gxxL;
+    gxy[index] = gxyL;
+    gxz[index] = gxzL;
+    gyy[index] = gyyL;
+    gyz[index] = gyzL;
+    gzz[index] = gzzL;
+    kxx[index] = kxxL;
+    kxy[index] = kxyL;
+    kxz[index] = kxzL;
+    kyy[index] = kyyL;
+    kyz[index] = kyzL;
+    kzz[index] = kzzL;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_convertToADMBase);
 }
 
-extern "C" void ML_BSSN_O8_convertToADMBase(CCTK_ARGUMENTS)
+void ML_BSSN_O8_convertToADMBase(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShift.c b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShift.c
new file mode 100644
index 0000000..cf9c905
--- /dev/null
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShift.c
@@ -0,0 +1,220 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "cctk.h"
+#include "cctk_Arguments.h"
+#include "cctk_Parameters.h"
+#include "GenericFD.h"
+#include "Differencing.h"
+#include "loopcontrol.h"
+
+/* Define macros used in calculations */
+#define INITVALUE  (42)
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+#define QAD(x) ((x) * (x) * (x) * (x))
+
+void ML_BSSN_O8_convertToADMBaseDtLapseShift_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  
+  /* Declare finite differencing variables */
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_O8_convertToADMBaseDtLapseShift_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_O8_convertToADMBaseDtLapseShift_calc_every != ML_BSSN_O8_convertToADMBaseDtLapseShift_calc_offset)
+  {
+    return;
+  }
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
+  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
+  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
+  int const di = 1;
+  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  CCTK_REAL const dxi = 1.0 / dx;
+  CCTK_REAL const dyi = 1.0 / dy;
+  CCTK_REAL const dzi = 1.0 / dz;
+  CCTK_REAL const khalf = 0.5;
+  CCTK_REAL const kthird = 1/3.0;
+  CCTK_REAL const ktwothird = 2.0/3.0;
+  CCTK_REAL const kfourthird = 4.0/3.0;
+  CCTK_REAL const keightthird = 8.0/3.0;
+  CCTK_REAL const hdxi = 0.5 * dxi;
+  CCTK_REAL const hdyi = 0.5 * dyi;
+  CCTK_REAL const hdzi = 0.5 * dzi;
+  
+  /* Initialize predefined quantities */
+  CCTK_REAL const p1o1024dx = INV(dx)/1024.;
+  CCTK_REAL const p1o1024dy = INV(dy)/1024.;
+  CCTK_REAL const p1o1024dz = INV(dz)/1024.;
+  CCTK_REAL const p1o1680dx = INV(dx)/1680.;
+  CCTK_REAL const p1o1680dy = INV(dy)/1680.;
+  CCTK_REAL const p1o1680dz = INV(dz)/1680.;
+  CCTK_REAL const p1o5040dx2 = pow(dx,-2)/5040.;
+  CCTK_REAL const p1o5040dy2 = pow(dy,-2)/5040.;
+  CCTK_REAL const p1o5040dz2 = pow(dz,-2)/5040.;
+  CCTK_REAL const p1o560dx = INV(dx)/560.;
+  CCTK_REAL const p1o560dy = INV(dy)/560.;
+  CCTK_REAL const p1o560dz = INV(dz)/560.;
+  CCTK_REAL const p1o705600dxdy = (INV(dx)*INV(dy))/705600.;
+  CCTK_REAL const p1o705600dxdz = (INV(dx)*INV(dz))/705600.;
+  CCTK_REAL const p1o705600dydz = (INV(dy)*INV(dz))/705600.;
+  CCTK_REAL const p1o840dx = INV(dx)/840.;
+  CCTK_REAL const p1o840dy = INV(dy)/840.;
+  CCTK_REAL const p1o840dz = INV(dz)/840.;
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o840dx = -INV(dx)/840.;
+  CCTK_REAL const pm1o840dy = -INV(dy)/840.;
+  CCTK_REAL const pm1o840dz = -INV(dz)/840.;
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_O8_convertToADMBaseDtLapseShift,
+            i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    // int index = INITVALUE;
+    int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
+    /* Declare derivatives */
+    // CCTK_REAL PDupwindNthAnti1alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3alpha = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta1 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta2 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti1beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm1beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti2beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm2beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthAnti3beta3 = INITVALUE;
+    // CCTK_REAL PDupwindNthSymm3beta3 = INITVALUE;
+    
+    /* Assign local copies of grid functions */
+    CCTK_REAL  AL = A[index];
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  B1L = B1[index];
+    CCTK_REAL  B2L = B2[index];
+    CCTK_REAL  B3L = B3[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  rL = r[index];
+    CCTK_REAL  trKL = trK[index];
+    CCTK_REAL  Xt1L = Xt1[index];
+    CCTK_REAL  Xt2L = Xt2[index];
+    CCTK_REAL  Xt3L = Xt3[index];
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    CCTK_REAL const PDupwindNthAnti1alpha = PDupwindNthAnti1(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1alpha = PDupwindNthSymm1(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2alpha = PDupwindNthAnti2(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2alpha = PDupwindNthSymm2(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3alpha = PDupwindNthAnti3(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3alpha = PDupwindNthSymm3(alpha, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta1 = PDupwindNthAnti1(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta1 = PDupwindNthSymm1(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta1 = PDupwindNthAnti2(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta1 = PDupwindNthSymm2(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta1 = PDupwindNthAnti3(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta1 = PDupwindNthSymm3(beta1, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta2 = PDupwindNthAnti1(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta2 = PDupwindNthSymm1(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta2 = PDupwindNthAnti2(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta2 = PDupwindNthSymm2(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta2 = PDupwindNthAnti3(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta2 = PDupwindNthSymm3(beta2, i, j, k);
+    CCTK_REAL const PDupwindNthAnti1beta3 = PDupwindNthAnti1(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm1beta3 = PDupwindNthSymm1(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti2beta3 = PDupwindNthAnti2(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm2beta3 = PDupwindNthSymm2(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthAnti3beta3 = PDupwindNthAnti3(beta3, i, j, k);
+    CCTK_REAL const PDupwindNthSymm3beta3 = PDupwindNthSymm3(beta3, i, j, k);
+    
+    /* Calculate temporaries and grid functions */
+    int dir1 = Sign(beta1L);
+    
+    int dir2 = Sign(beta2L);
+    
+    int dir3 = Sign(beta3L);
+    
+    CCTK_REAL eta = fmin(1,SpatialBetaDriverRadius*INV(rL));
+    
+    CCTK_REAL theta = fmin(1,exp(1 - 
+      rL*INV(SpatialShiftGammaCoeffRadius)));
+    
+    CCTK_REAL dtalpL = LapseAdvectionCoeff*(beta1L*PDupwindNthAnti1alpha + 
+      beta2L*PDupwindNthAnti2alpha + beta3L*PDupwindNthAnti3alpha + 
+      PDupwindNthSymm1alpha*Abs(beta1L) + PDupwindNthSymm2alpha*Abs(beta2L) + 
+      PDupwindNthSymm3alpha*Abs(beta3L)) - harmonicF*(LapseACoeff*(AL - trKL) 
+      + trKL)*pow(alphaL,harmonicN);
+    
+    CCTK_REAL dtbetaxL = ShiftGammaCoeff*theta*(beta1L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B1L - Xt1L) + Xt1L) + 
+      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta1 + 
+      beta2L*PDupwindNthAnti2beta1 + beta3L*PDupwindNthAnti3beta1 + 
+      PDupwindNthSymm1beta1*Abs(beta1L) + PDupwindNthSymm2beta1*Abs(beta2L) + 
+      PDupwindNthSymm3beta1*Abs(beta3L));
+    
+    CCTK_REAL dtbetayL = ShiftGammaCoeff*theta*(beta2L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B2L - Xt2L) + Xt2L) + 
+      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta2 + 
+      beta2L*PDupwindNthAnti2beta2 + beta3L*PDupwindNthAnti3beta2 + 
+      PDupwindNthSymm1beta2*Abs(beta1L) + PDupwindNthSymm2beta2*Abs(beta2L) + 
+      PDupwindNthSymm3beta2*Abs(beta3L));
+    
+    CCTK_REAL dtbetazL = ShiftGammaCoeff*theta*(beta3L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B3L - Xt3L) + Xt3L) + 
+      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta3 + 
+      beta2L*PDupwindNthAnti2beta3 + beta3L*PDupwindNthAnti3beta3 + 
+      PDupwindNthSymm1beta3*Abs(beta1L) + PDupwindNthSymm2beta3*Abs(beta2L) + 
+      PDupwindNthSymm3beta3*Abs(beta3L));
+    
+    
+    /* Copy local copies back to grid functions */
+    dtalp[index] = dtalpL;
+    dtbetax[index] = dtbetaxL;
+    dtbetay[index] = dtbetayL;
+    dtbetaz[index] = dtbetazL;
+  }
+  LC_ENDLOOP3 (ML_BSSN_O8_convertToADMBaseDtLapseShift);
+}
+
+void ML_BSSN_O8_convertToADMBaseDtLapseShift(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_O8_convertToADMBaseDtLapseShift_Body);
+}
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShift.cc b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShift.cc
deleted file mode 100644
index f0cfa9d..0000000
--- a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShift.cc
+++ /dev/null
@@ -1,226 +0,0 @@
-/*  File produced by Kranc */
-
-#define KRANC_C
-
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
-#include "GenericFD.h"
-#include "Differencing.h"
-#include "Vectors.hh"
-#include "loopcontrol.h"
-
-/* Define macros used in calculations */
-#define INITVALUE  (42)
-#define INV(x) ((1.0) / (x))
-#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
-#define QAD(x) ((x) * (x) * (x) * (x))
-
-static void ML_BSSN_O8_convertToADMBaseDtLapseShift_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  
-  /* Declare finite differencing variables */
-  
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_O8_convertToADMBaseDtLapseShift_Body");
-  }
-  
-  if (cctk_iteration % ML_BSSN_O8_convertToADMBaseDtLapseShift_calc_every != ML_BSSN_O8_convertToADMBaseDtLapseShift_calc_offset)
-  {
-    return;
-  }
-  
-  /* Include user-supplied include files */
-  
-  /* Initialise finite differencing variables */
-  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
-  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
-  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
-  int const di = 1;
-  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  CCTK_REAL const dxi = 1.0 / dx;
-  CCTK_REAL const dyi = 1.0 / dy;
-  CCTK_REAL const dzi = 1.0 / dz;
-  CCTK_REAL const khalf = 0.5;
-  CCTK_REAL const kthird = 1/3.0;
-  CCTK_REAL const ktwothird = 2.0/3.0;
-  CCTK_REAL const kfourthird = 4.0/3.0;
-  CCTK_REAL const keightthird = 8.0/3.0;
-  CCTK_REAL const hdxi = 0.5 * dxi;
-  CCTK_REAL const hdyi = 0.5 * dyi;
-  CCTK_REAL const hdzi = 0.5 * dzi;
-  
-  /* Initialize predefined quantities */
-  CCTK_REAL const p1o1024dx = INV(dx)/1024.;
-  CCTK_REAL const p1o1024dy = INV(dy)/1024.;
-  CCTK_REAL const p1o1024dz = INV(dz)/1024.;
-  CCTK_REAL const p1o1680dx = INV(dx)/1680.;
-  CCTK_REAL const p1o1680dy = INV(dy)/1680.;
-  CCTK_REAL const p1o1680dz = INV(dz)/1680.;
-  CCTK_REAL const p1o5040dx2 = pow(dx,-2)/5040.;
-  CCTK_REAL const p1o5040dy2 = pow(dy,-2)/5040.;
-  CCTK_REAL const p1o5040dz2 = pow(dz,-2)/5040.;
-  CCTK_REAL const p1o560dx = INV(dx)/560.;
-  CCTK_REAL const p1o560dy = INV(dy)/560.;
-  CCTK_REAL const p1o560dz = INV(dz)/560.;
-  CCTK_REAL const p1o705600dxdy = (INV(dx)*INV(dy))/705600.;
-  CCTK_REAL const p1o705600dxdz = (INV(dx)*INV(dz))/705600.;
-  CCTK_REAL const p1o705600dydz = (INV(dy)*INV(dz))/705600.;
-  CCTK_REAL const p1o840dx = INV(dx)/840.;
-  CCTK_REAL const p1o840dy = INV(dy)/840.;
-  CCTK_REAL const p1o840dz = INV(dz)/840.;
-  CCTK_REAL const p1odx = INV(dx);
-  CCTK_REAL const p1ody = INV(dy);
-  CCTK_REAL const p1odz = INV(dz);
-  CCTK_REAL const pm1o840dx = -INV(dx)/840.;
-  CCTK_REAL const pm1o840dy = -INV(dy)/840.;
-  CCTK_REAL const pm1o840dz = -INV(dz)/840.;
-  
-  /* Loop over the grid points */
-  #pragma omp parallel
-  LC_LOOP3 (ML_BSSN_O8_convertToADMBaseDtLapseShift,
-            i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
-  {
-    // int index = INITVALUE;
-    int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    /* Declare derivatives */
-    // CCTK_REAL_VEC PDupwindNthAnti1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3alpha = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta1 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta2 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm1beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm2beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthAnti3beta3 = INITVALUE;
-    // CCTK_REAL_VEC PDupwindNthSymm3beta3 = INITVALUE;
-    
-    /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  AL = vec_load(A[index]);
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  B1L = vec_load(B1[index]);
-    CCTK_REAL_VEC  B2L = vec_load(B2[index]);
-    CCTK_REAL_VEC  B3L = vec_load(B3[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  rL = vec_load(r[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
-    CCTK_REAL_VEC  Xt1L = vec_load(Xt1[index]);
-    CCTK_REAL_VEC  Xt2L = vec_load(Xt2[index]);
-    CCTK_REAL_VEC  Xt3L = vec_load(Xt3[index]);
-    
-    /* Include user supplied include files */
-    
-    /* Precompute derivatives */
-    CCTK_REAL_VEC const PDupwindNthAnti1alpha = PDupwindNthAnti1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1alpha = PDupwindNthSymm1(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2alpha = PDupwindNthAnti2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2alpha = PDupwindNthSymm2(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3alpha = PDupwindNthAnti3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3alpha = PDupwindNthSymm3(alpha, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta1 = PDupwindNthAnti1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta1 = PDupwindNthSymm1(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta1 = PDupwindNthAnti2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta1 = PDupwindNthSymm2(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta1 = PDupwindNthAnti3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta1 = PDupwindNthSymm3(beta1, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta2 = PDupwindNthAnti1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta2 = PDupwindNthSymm1(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta2 = PDupwindNthAnti2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta2 = PDupwindNthSymm2(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta2 = PDupwindNthAnti3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta2 = PDupwindNthSymm3(beta2, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti1beta3 = PDupwindNthAnti1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm1beta3 = PDupwindNthSymm1(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti2beta3 = PDupwindNthAnti2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm2beta3 = PDupwindNthSymm2(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthAnti3beta3 = PDupwindNthAnti3(beta3, i, j, k);
-    CCTK_REAL_VEC const PDupwindNthSymm3beta3 = PDupwindNthSymm3(beta3, i, j, k);
-    
-    /* Calculate temporaries and grid functions */
-    int dir1 = Sign(beta1L);
-    
-    int dir2 = Sign(beta2L);
-    
-    int dir3 = Sign(beta3L);
-    
-    CCTK_REAL_VEC eta = fmin(1,SpatialBetaDriverRadius*INV(rL));
-    
-    CCTK_REAL_VEC theta = fmin(1,exp(1 - 
-      rL*INV(SpatialShiftGammaCoeffRadius)));
-    
-    CCTK_REAL_VEC dtalpL = 
-      LapseAdvectionCoeff*(beta1L*PDupwindNthAnti1alpha + 
-      beta2L*PDupwindNthAnti2alpha + beta3L*PDupwindNthAnti3alpha + 
-      PDupwindNthSymm1alpha*Abs(beta1L) + PDupwindNthSymm2alpha*Abs(beta2L) + 
-      PDupwindNthSymm3alpha*Abs(beta3L)) - harmonicF*(LapseACoeff*(AL - trKL) 
-      + trKL)*pow(alphaL,harmonicN);
-    
-    CCTK_REAL_VEC dtbetaxL = 
-      ShiftGammaCoeff*theta*(beta1L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B1L - Xt1L) + Xt1L) + 
-      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta1 + 
-      beta2L*PDupwindNthAnti2beta1 + beta3L*PDupwindNthAnti3beta1 + 
-      PDupwindNthSymm1beta1*Abs(beta1L) + PDupwindNthSymm2beta1*Abs(beta2L) + 
-      PDupwindNthSymm3beta1*Abs(beta3L));
-    
-    CCTK_REAL_VEC dtbetayL = 
-      ShiftGammaCoeff*theta*(beta2L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B2L - Xt2L) + Xt2L) + 
-      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta2 + 
-      beta2L*PDupwindNthAnti2beta2 + beta3L*PDupwindNthAnti3beta2 + 
-      PDupwindNthSymm1beta2*Abs(beta1L) + PDupwindNthSymm2beta2*Abs(beta2L) + 
-      PDupwindNthSymm3beta2*Abs(beta3L));
-    
-    CCTK_REAL_VEC dtbetazL = 
-      ShiftGammaCoeff*theta*(beta3L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B3L - Xt3L) + Xt3L) + 
-      ShiftAdvectionCoeff*(beta1L*PDupwindNthAnti1beta3 + 
-      beta2L*PDupwindNthAnti2beta3 + beta3L*PDupwindNthAnti3beta3 + 
-      PDupwindNthSymm1beta3*Abs(beta1L) + PDupwindNthSymm2beta3*Abs(beta2L) + 
-      PDupwindNthSymm3beta3*Abs(beta3L));
-    
-    
-    /* Copy local copies back to grid functions */
-    vec_store_nta(dtalp[index],dtalpL);
-    vec_store_nta(dtbetax[index],dtbetaxL);
-    vec_store_nta(dtbetay[index],dtbetayL);
-    vec_store_nta(dtbetaz[index],dtbetazL);
-  i += CCTK_REAL_VEC_SIZE-1;
-  }
-  LC_ENDLOOP3 (ML_BSSN_O8_convertToADMBaseDtLapseShift);
-}
-
-extern "C" void ML_BSSN_O8_convertToADMBaseDtLapseShift(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_O8_convertToADMBaseDtLapseShift_Body);
-}
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary.cc b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary.c
index 4a7e158..463a8bb 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -97,57 +96,53 @@ static void ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * res
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  AL = vec_load(A[index]);
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  B1L = vec_load(B1[index]);
-    CCTK_REAL_VEC  B2L = vec_load(B2[index]);
-    CCTK_REAL_VEC  B3L = vec_load(B3[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  rL = vec_load(r[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
-    CCTK_REAL_VEC  Xt1L = vec_load(Xt1[index]);
-    CCTK_REAL_VEC  Xt2L = vec_load(Xt2[index]);
-    CCTK_REAL_VEC  Xt3L = vec_load(Xt3[index]);
+    CCTK_REAL  AL = A[index];
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  B1L = B1[index];
+    CCTK_REAL  B2L = B2[index];
+    CCTK_REAL  B3L = B3[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  rL = r[index];
+    CCTK_REAL  trKL = trK[index];
+    CCTK_REAL  Xt1L = Xt1[index];
+    CCTK_REAL  Xt2L = Xt2[index];
+    CCTK_REAL  Xt3L = Xt3[index];
     
     /* Include user supplied include files */
     
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC eta = fmin(1,SpatialBetaDriverRadius*INV(rL));
+    CCTK_REAL eta = fmin(1,SpatialBetaDriverRadius*INV(rL));
     
-    CCTK_REAL_VEC theta = fmin(1,exp(1 - 
+    CCTK_REAL theta = fmin(1,exp(1 - 
       rL*INV(SpatialShiftGammaCoeffRadius)));
     
-    CCTK_REAL_VEC dtalpL = -(harmonicF*(LapseACoeff*(AL - trKL) + 
+    CCTK_REAL dtalpL = -(harmonicF*(LapseACoeff*(AL - trKL) + 
       trKL)*pow(alphaL,harmonicN));
     
-    CCTK_REAL_VEC dtbetaxL = 
-      ShiftGammaCoeff*theta*(beta1L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B1L - Xt1L) + Xt1L);
+    CCTK_REAL dtbetaxL = ShiftGammaCoeff*theta*(beta1L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B1L - Xt1L) + Xt1L);
     
-    CCTK_REAL_VEC dtbetayL = 
-      ShiftGammaCoeff*theta*(beta2L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B2L - Xt2L) + Xt2L);
+    CCTK_REAL dtbetayL = ShiftGammaCoeff*theta*(beta2L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B2L - Xt2L) + Xt2L);
     
-    CCTK_REAL_VEC dtbetazL = 
-      ShiftGammaCoeff*theta*(beta3L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B3L - Xt3L) + Xt3L);
+    CCTK_REAL dtbetazL = ShiftGammaCoeff*theta*(beta3L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B3L - Xt3L) + Xt3L);
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(dtalp[index],dtalpL);
-    vec_store_nta(dtbetax[index],dtbetaxL);
-    vec_store_nta(dtbetay[index],dtbetayL);
-    vec_store_nta(dtbetaz[index],dtbetazL);
-  i += CCTK_REAL_VEC_SIZE-1;
+    dtalp[index] = dtalpL;
+    dtbetax[index] = dtbetaxL;
+    dtbetay[index] = dtbetayL;
+    dtbetaz[index] = dtbetazL;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary);
 }
 
-extern "C" void ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary(CCTK_ARGUMENTS)
+void ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseFakeDtLapseShift.cc b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseFakeDtLapseShift.c
index 98db385..72a523b 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseFakeDtLapseShift.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBaseFakeDtLapseShift.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -97,57 +96,53 @@ static void ML_BSSN_O8_convertToADMBaseFakeDtLapseShift_Body(cGH const * restric
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  AL = vec_load(A[index]);
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  B1L = vec_load(B1[index]);
-    CCTK_REAL_VEC  B2L = vec_load(B2[index]);
-    CCTK_REAL_VEC  B3L = vec_load(B3[index]);
-    CCTK_REAL_VEC  beta1L = vec_load(beta1[index]);
-    CCTK_REAL_VEC  beta2L = vec_load(beta2[index]);
-    CCTK_REAL_VEC  beta3L = vec_load(beta3[index]);
-    CCTK_REAL_VEC  rL = vec_load(r[index]);
-    CCTK_REAL_VEC  trKL = vec_load(trK[index]);
-    CCTK_REAL_VEC  Xt1L = vec_load(Xt1[index]);
-    CCTK_REAL_VEC  Xt2L = vec_load(Xt2[index]);
-    CCTK_REAL_VEC  Xt3L = vec_load(Xt3[index]);
+    CCTK_REAL  AL = A[index];
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  B1L = B1[index];
+    CCTK_REAL  B2L = B2[index];
+    CCTK_REAL  B3L = B3[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  rL = r[index];
+    CCTK_REAL  trKL = trK[index];
+    CCTK_REAL  Xt1L = Xt1[index];
+    CCTK_REAL  Xt2L = Xt2[index];
+    CCTK_REAL  Xt3L = Xt3[index];
     
     /* Include user supplied include files */
     
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC eta = fmin(1,SpatialBetaDriverRadius*INV(rL));
+    CCTK_REAL eta = fmin(1,SpatialBetaDriverRadius*INV(rL));
     
-    CCTK_REAL_VEC theta = fmin(1,exp(1 - 
+    CCTK_REAL theta = fmin(1,exp(1 - 
       rL*INV(SpatialShiftGammaCoeffRadius)));
     
-    CCTK_REAL_VEC dtalpL = -(harmonicF*(LapseACoeff*(AL - trKL) + 
+    CCTK_REAL dtalpL = -(harmonicF*(LapseACoeff*(AL - trKL) + 
       trKL)*pow(alphaL,harmonicN));
     
-    CCTK_REAL_VEC dtbetaxL = 
-      ShiftGammaCoeff*theta*(beta1L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B1L - Xt1L) + Xt1L);
+    CCTK_REAL dtbetaxL = ShiftGammaCoeff*theta*(beta1L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B1L - Xt1L) + Xt1L);
     
-    CCTK_REAL_VEC dtbetayL = 
-      ShiftGammaCoeff*theta*(beta2L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B2L - Xt2L) + Xt2L);
+    CCTK_REAL dtbetayL = ShiftGammaCoeff*theta*(beta2L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B2L - Xt2L) + Xt2L);
     
-    CCTK_REAL_VEC dtbetazL = 
-      ShiftGammaCoeff*theta*(beta3L*BetaDriver*eta*(-1 + ShiftBCoeff) + 
-      ShiftBCoeff*(B3L - Xt3L) + Xt3L);
+    CCTK_REAL dtbetazL = ShiftGammaCoeff*theta*(beta3L*BetaDriver*eta*(-1 
+      + ShiftBCoeff) + ShiftBCoeff*(B3L - Xt3L) + Xt3L);
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(dtalp[index],dtalpL);
-    vec_store_nta(dtbetax[index],dtbetaxL);
-    vec_store_nta(dtbetay[index],dtbetayL);
-    vec_store_nta(dtbetaz[index],dtbetazL);
-  i += CCTK_REAL_VEC_SIZE-1;
+    dtalp[index] = dtalpL;
+    dtbetax[index] = dtbetaxL;
+    dtbetay[index] = dtbetayL;
+    dtbetaz[index] = dtbetazL;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_convertToADMBaseFakeDtLapseShift);
 }
 
-extern "C" void ML_BSSN_O8_convertToADMBaseFakeDtLapseShift(CCTK_ARGUMENTS)
+void ML_BSSN_O8_convertToADMBaseFakeDtLapseShift(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_enforce.cc b/ML_BSSN_O8/src/ML_BSSN_O8_enforce.c
index 9665e6e..5fb8658 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_enforce.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_enforce.c
@@ -11,7 +11,6 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
-#include "Vectors.hh"
 #include "loopcontrol.h"
 
 /* Define macros used in calculations */
@@ -21,7 +20,7 @@
 #define CUB(x) ((x) * (x) * (x))
 #define QAD(x) ((x) * (x) * (x) * (x))
 
-static void ML_BSSN_O8_enforce_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+void ML_BSSN_O8_enforce_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -97,40 +96,40 @@ static void ML_BSSN_O8_enforce_Body(cGH const * restrict const cctkGH, int const
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
-    CCTK_REAL_VEC  alphaL = vec_load(alpha[index]);
-    CCTK_REAL_VEC  At11L = vec_load(At11[index]);
-    CCTK_REAL_VEC  At12L = vec_load(At12[index]);
-    CCTK_REAL_VEC  At13L = vec_load(At13[index]);
-    CCTK_REAL_VEC  At22L = vec_load(At22[index]);
-    CCTK_REAL_VEC  At23L = vec_load(At23[index]);
-    CCTK_REAL_VEC  At33L = vec_load(At33[index]);
-    CCTK_REAL_VEC  gt11L = vec_load(gt11[index]);
-    CCTK_REAL_VEC  gt12L = vec_load(gt12[index]);
-    CCTK_REAL_VEC  gt13L = vec_load(gt13[index]);
-    CCTK_REAL_VEC  gt22L = vec_load(gt22[index]);
-    CCTK_REAL_VEC  gt23L = vec_load(gt23[index]);
-    CCTK_REAL_VEC  gt33L = vec_load(gt33[index]);
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  At11L = At11[index];
+    CCTK_REAL  At12L = At12[index];
+    CCTK_REAL  At13L = At13[index];
+    CCTK_REAL  At22L = At22[index];
+    CCTK_REAL  At23L = At23[index];
+    CCTK_REAL  At33L = At33[index];
+    CCTK_REAL  gt11L = gt11[index];
+    CCTK_REAL  gt12L = gt12[index];
+    CCTK_REAL  gt13L = gt13[index];
+    CCTK_REAL  gt22L = gt22[index];
+    CCTK_REAL  gt23L = gt23[index];
+    CCTK_REAL  gt33L = gt33[index];
     
     /* Include user supplied include files */
     
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL_VEC detgt = 1;
+    CCTK_REAL detgt = 1;
     
-    CCTK_REAL_VEC gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
+    CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
     
-    CCTK_REAL_VEC gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
+    CCTK_REAL gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
+    CCTK_REAL gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
+    CCTK_REAL gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
     
-    CCTK_REAL_VEC gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
+    CCTK_REAL gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
     
-    CCTK_REAL_VEC gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
+    CCTK_REAL gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
     
-    CCTK_REAL_VEC trAt = At11L*gtu11 + At22L*gtu22 + 2*(At12L*gtu21 + 
+    CCTK_REAL trAt = At11L*gtu11 + At22L*gtu22 + 2*(At12L*gtu21 + 
       At13L*gtu31 + At23L*gtu32) + At33L*gtu33;
     
     At11L = At11L - gt11L*kthird*trAt;
@@ -149,19 +148,18 @@ static void ML_BSSN_O8_enforce_Body(cGH const * restrict const cctkGH, int const
     
     
     /* Copy local copies back to grid functions */
-    vec_store_nta(alpha[index],alphaL);
-    vec_store_nta(At11[index],At11L);
-    vec_store_nta(At12[index],At12L);
-    vec_store_nta(At13[index],At13L);
-    vec_store_nta(At22[index],At22L);
-    vec_store_nta(At23[index],At23L);
-    vec_store_nta(At33[index],At33L);
-  i += CCTK_REAL_VEC_SIZE-1;
+    alpha[index] = alphaL;
+    At11[index] = At11L;
+    At12[index] = At12L;
+    At13[index] = At13L;
+    At22[index] = At22L;
+    At23[index] = At23L;
+    At33[index] = At33L;
   }
   LC_ENDLOOP3 (ML_BSSN_O8_enforce);
 }
 
-extern "C" void ML_BSSN_O8_enforce(CCTK_ARGUMENTS)
+void ML_BSSN_O8_enforce(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
diff --git a/ML_BSSN_O8/src/make.code.defn b/ML_BSSN_O8/src/make.code.defn
index 8799514..7aae218 100644
--- a/ML_BSSN_O8/src/make.code.defn
+++ b/ML_BSSN_O8/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_O8_Minkowski.cc ML_BSSN_O8_convertFromADMBase.cc ML_BSSN_O8_convertFromADMBaseGamma.cc ML_BSSN_O8_RHS1.cc ML_BSSN_O8_RHS2.cc ML_BSSN_O8_RHSStaticBoundary.cc ML_BSSN_O8_RHSRadiativeBoundary.cc ML_BSSN_O8_enforce.cc ML_BSSN_O8_boundary.cc ML_BSSN_O8_convertToADMBase.cc ML_BSSN_O8_convertToADMBaseDtLapseShift.cc ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_O8_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_O8_constraints.cc ML_BSSN_O8_constraints_boundary.cc Boundaries.c 
+SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_O8_Minkowski.c ML_BSSN_O8_convertFromADMBase.c ML_BSSN_O8_convertFromADMBaseGamma.c ML_BSSN_O8_RHS1.c ML_BSSN_O8_RHS2.c ML_BSSN_O8_RHSStaticBoundary.c ML_BSSN_O8_RHSRadiativeBoundary.c ML_BSSN_O8_enforce.c ML_BSSN_O8_boundary.c ML_BSSN_O8_convertToADMBase.c ML_BSSN_O8_convertToADMBaseDtLapseShift.c ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary.c ML_BSSN_O8_convertToADMBaseFakeDtLapseShift.c ML_BSSN_O8_constraints.c ML_BSSN_O8_constraints_boundary.c Boundaries.c