Add new RHS boundary condition NewRad, implemented in the thorn LSUThorns/NewRad.

214 files changed, 3086 insertions, 1780 deletions

diff --git a/ML_ADM/configuration.ccl b/ML_ADM/configuration.ccl
index 290ba20..148a1a1 100644
--- a/ML_ADM/configuration.ccl
+++ b/ML_ADM/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_ADM/interface.ccl b/ML_ADM/interface.ccl
index b59be52..f712b9e 100644
--- a/ML_ADM/interface.ccl
+++ b/ML_ADM/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_ADM
 
@@ -42,42 +39,6 @@ CCTK_REAL ML_mom type=GF timelevels=1 tags='tensortypealias="D" tensorweight=1.0
 } "ML_mom"
 
 public:
-CCTK_REAL ML_curvrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000'
-{
-  K11rhs,
-  K12rhs,
-  K13rhs,
-  K22rhs,
-  K23rhs,
-  K33rhs
-} "ML_curvrhs"
-
-public:
-CCTK_REAL ML_lapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  alpharhs
-} "ML_lapserhs"
-
-public:
-CCTK_REAL ML_metricrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000'
-{
-  g11rhs,
-  g12rhs,
-  g13rhs,
-  g22rhs,
-  g23rhs,
-  g33rhs
-} "ML_metricrhs"
-
-public:
-CCTK_REAL ML_shiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  beta1rhs,
-  beta2rhs,
-  beta3rhs
-} "ML_shiftrhs"
-
-public:
 CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000'
 {
   K11,
@@ -112,3 +73,39 @@ CCTK_REAL ML_shift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1
   beta2,
   beta3
 } "ML_shift"
+
+public:
+CCTK_REAL ML_curvrhs type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000'
+{
+  K11rhs,
+  K12rhs,
+  K13rhs,
+  K22rhs,
+  K23rhs,
+  K33rhs
+} "ML_curvrhs"
+
+public:
+CCTK_REAL ML_lapserhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  alpharhs
+} "ML_lapserhs"
+
+public:
+CCTK_REAL ML_metricrhs type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000'
+{
+  g11rhs,
+  g12rhs,
+  g13rhs,
+  g22rhs,
+  g23rhs,
+  g33rhs
+} "ML_metricrhs"
+
+public:
+CCTK_REAL ML_shiftrhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  beta1rhs,
+  beta2rhs,
+  beta3rhs
+} "ML_shiftrhs"
diff --git a/ML_ADM/param.ccl b/ML_ADM/param.ccl
index 55eee02..d6e64bb 100644
--- a/ML_ADM/param.ccl
+++ b/ML_ADM/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: GenericFD
@@ -50,6 +47,12 @@ CCTK_INT timelevels "Number of active timelevels"
 } 3
 
 restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_INT ML_ADM_Minkowski_calc_every "ML_ADM_Minkowski_calc_every"
 {
   *:* :: ""
diff --git a/ML_ADM/schedule.ccl b/ML_ADM/schedule.ccl
index 6fe88ce..0140a0d 100644
--- a/ML_ADM/schedule.ccl
+++ b/ML_ADM/schedule.ccl
@@ -1,21 +1,10 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 STORAGE: ML_Ham[1]
 
 STORAGE: ML_mom[1]
 
-STORAGE: ML_curvrhs[1]
-
-STORAGE: ML_lapserhs[1]
-
-STORAGE: ML_metricrhs[1]
-
-STORAGE: ML_shiftrhs[1]
-
 if (timelevels == 1)
 {
   STORAGE: ML_curv[1]
@@ -68,6 +57,58 @@ if (timelevels == 3)
   STORAGE: ML_shift[3]
 }
 
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_curvrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_lapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_lapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_lapserhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_metricrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_metricrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_metricrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_shiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_shiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_shiftrhs[3]
+}
+
 schedule ML_ADM_Startup at STARTUP
 {
   LANG: C
diff --git a/ML_ADM/src/Boundaries.c b/ML_ADM/src/Boundaries.c
index 1be5d43..bb27ba6 100644
--- a/ML_ADM/src/Boundaries.c
+++ b/ML_ADM/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_ADM/src/ML_ADM_Minkowski.c b/ML_ADM/src/ML_ADM_Minkowski.c
index 829a327..8db192c 100644
--- a/ML_ADM/src/ML_ADM_Minkowski.c
+++ b/ML_ADM/src/ML_ADM_Minkowski.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_ADM/src/ML_ADM_RHS.c b/ML_ADM/src/ML_ADM_RHS.c
index 2db384e..d1dbb86 100644
--- a/ML_ADM/src/ML_ADM_RHS.c
+++ b/ML_ADM/src/ML_ADM_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_ADM/src/ML_ADM_boundary.c b/ML_ADM/src/ML_ADM_boundary.c
index 00663d9..1fb285e 100644
--- a/ML_ADM/src/ML_ADM_boundary.c
+++ b/ML_ADM/src/ML_ADM_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_ADM/src/ML_ADM_constraints.c b/ML_ADM/src/ML_ADM_constraints.c
index d944da7..bce39cc 100644
--- a/ML_ADM/src/ML_ADM_constraints.c
+++ b/ML_ADM/src/ML_ADM_constraints.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_ADM/src/ML_ADM_constraints_boundary.c b/ML_ADM/src/ML_ADM_constraints_boundary.c
index 1c66e36..b2d0441 100644
--- a/ML_ADM/src/ML_ADM_constraints_boundary.c
+++ b/ML_ADM/src/ML_ADM_constraints_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_ADM/src/ML_ADM_convertFromADMBase.c b/ML_ADM/src/ML_ADM_convertFromADMBase.c
index 6131bd5..c524164 100644
--- a/ML_ADM/src/ML_ADM_convertFromADMBase.c
+++ b/ML_ADM/src/ML_ADM_convertFromADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_ADM/src/ML_ADM_convertToADMBase.c b/ML_ADM/src/ML_ADM_convertToADMBase.c
index 5e5ba1a..8aaf272 100644
--- a/ML_ADM/src/ML_ADM_convertToADMBase.c
+++ b/ML_ADM/src/ML_ADM_convertToADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_ADM/src/RegisterMoL.c b/ML_ADM/src/RegisterMoL.c
index ed378fc..c8f9711 100644
--- a/ML_ADM/src/RegisterMoL.c
+++ b/ML_ADM/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_ADM/src/RegisterSymmetries.c b/ML_ADM/src/RegisterSymmetries.c
index ea1cb55..567f321 100644
--- a/ML_ADM/src/RegisterSymmetries.c
+++ b/ML_ADM/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_ADM/src/Startup.c b/ML_ADM/src/Startup.c
index 9837d37..80d6f0d 100644
--- a/ML_ADM/src/Startup.c
+++ b/ML_ADM/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_ADM/src/make.code.defn b/ML_ADM/src/make.code.defn
index 42afc5b..94bec8c 100644
--- a/ML_ADM/src/make.code.defn
+++ b/ML_ADM/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_ADM_Minkowski.c ML_ADM_convertFromADMBase.c ML_ADM_RHS.c ML_ADM_boundary.c ML_ADM_convertToADMBase.c ML_ADM_constraints.c ML_ADM_constraints_boundary.c Boundaries.c 
diff --git a/ML_BSSN/configuration.ccl b/ML_BSSN/configuration.ccl
index 5fb01c5..148a1a1 100644
--- a/ML_BSSN/configuration.ccl
+++ b/ML_BSSN/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_BSSN/interface.ccl b/ML_BSSN/interface.ccl
index 6de4c6b..52de196 100644
--- a/ML_BSSN/interface.ccl
+++ b/ML_BSSN/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_BSSN
 
@@ -62,77 +59,7 @@ CCTK_REAL ML_mom type=GF timelevels=1 tags='tensortypealias="D" tensorweight=1.0
 } "ML_mom"
 
 public:
-CCTK_REAL ML_curvrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  At11rhs,
-  At12rhs,
-  At13rhs,
-  At22rhs,
-  At23rhs,
-  At33rhs
-} "ML_curvrhs"
-
-public:
-CCTK_REAL ML_dtlapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  Arhs
-} "ML_dtlapserhs"
-
-public:
-CCTK_REAL ML_dtshiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  B1rhs,
-  B2rhs,
-  B3rhs
-} "ML_dtshiftrhs"
-
-public:
-CCTK_REAL ML_Gammarhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
-{
-  Xt1rhs,
-  Xt2rhs,
-  Xt3rhs
-} "ML_Gammarhs"
-
-public:
-CCTK_REAL ML_lapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  alpharhs
-} "ML_lapserhs"
-
-public:
-CCTK_REAL ML_log_confacrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
-{
-  phirhs
-} "ML_log_confacrhs"
-
-public:
-CCTK_REAL ML_metricrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  gt11rhs,
-  gt12rhs,
-  gt13rhs,
-  gt22rhs,
-  gt23rhs,
-  gt33rhs
-} "ML_metricrhs"
-
-public:
-CCTK_REAL ML_shiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  beta1rhs,
-  beta2rhs,
-  beta3rhs
-} "ML_shiftrhs"
-
-public:
-CCTK_REAL ML_trace_curvrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  trKrhs
-} "ML_trace_curvrhs"
-
-public:
-CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+CCTK_REAL ML_curv type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   At11,
   At12,
@@ -143,13 +70,13 @@ CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweig
 } "ML_curv"
 
 public:
-CCTK_REAL ML_dtlapse type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_dtlapse type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   A
 } "ML_dtlapse"
 
 public:
-CCTK_REAL ML_dtshift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_dtshift type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
 {
   B1,
   B2,
@@ -157,7 +84,7 @@ CCTK_REAL ML_dtshift type=GF timelevels=3 tags='tensortypealias="U" tensorweight
 } "ML_dtshift"
 
 public:
-CCTK_REAL ML_Gamma type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+CCTK_REAL ML_Gamma type=GF timelevels=4 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
 {
   Xt1,
   Xt2,
@@ -165,19 +92,19 @@ CCTK_REAL ML_Gamma type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0
 } "ML_Gamma"
 
 public:
-CCTK_REAL ML_lapse type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_lapse type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   alpha
 } "ML_lapse"
 
 public:
-CCTK_REAL ML_log_confac type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
+CCTK_REAL ML_log_confac type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
 {
   phi
 } "ML_log_confac"
 
 public:
-CCTK_REAL ML_metric type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+CCTK_REAL ML_metric type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   gt11,
   gt12,
@@ -188,7 +115,7 @@ CCTK_REAL ML_metric type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorwe
 } "ML_metric"
 
 public:
-CCTK_REAL ML_shift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_shift type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
 {
   beta1,
   beta2,
@@ -196,7 +123,77 @@ CCTK_REAL ML_shift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1
 } "ML_shift"
 
 public:
-CCTK_REAL ML_trace_curv type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_trace_curv type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   trK
 } "ML_trace_curv"
+
+public:
+CCTK_REAL ML_curvrhs type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  At11rhs,
+  At12rhs,
+  At13rhs,
+  At22rhs,
+  At23rhs,
+  At33rhs
+} "ML_curvrhs"
+
+public:
+CCTK_REAL ML_dtlapserhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  Arhs
+} "ML_dtlapserhs"
+
+public:
+CCTK_REAL ML_dtshiftrhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  B1rhs,
+  B2rhs,
+  B3rhs
+} "ML_dtshiftrhs"
+
+public:
+CCTK_REAL ML_Gammarhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+{
+  Xt1rhs,
+  Xt2rhs,
+  Xt3rhs
+} "ML_Gammarhs"
+
+public:
+CCTK_REAL ML_lapserhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  alpharhs
+} "ML_lapserhs"
+
+public:
+CCTK_REAL ML_log_confacrhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
+{
+  phirhs
+} "ML_log_confacrhs"
+
+public:
+CCTK_REAL ML_metricrhs type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  gt11rhs,
+  gt12rhs,
+  gt13rhs,
+  gt22rhs,
+  gt23rhs,
+  gt33rhs
+} "ML_metricrhs"
+
+public:
+CCTK_REAL ML_shiftrhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  beta1rhs,
+  beta2rhs,
+  beta3rhs
+} "ML_shiftrhs"
+
+public:
+CCTK_REAL ML_trace_curvrhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  trKrhs
+} "ML_trace_curvrhs"
diff --git a/ML_BSSN/param.ccl b/ML_BSSN/param.ccl
index 3de7605..dabbeb9 100644
--- a/ML_BSSN/param.ccl
+++ b/ML_BSSN/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: ADMBase
@@ -106,7 +103,7 @@ KEYWORD my_initial_data "my_initial_data"
   "Minkowski" :: "Minkowski"
 } "ADMBase"
 
-private:
+restricted:
 KEYWORD my_rhs_boundary_condition "my_rhs_boundary_condition"
 {
   "none" :: "none"
@@ -137,8 +134,14 @@ CCTK_INT ML_BSSN_MaxNumEvolvedVars "Number of evolved variables used by this tho
 restricted:
 CCTK_INT timelevels "Number of active timelevels"
 {
-  0:3 :: ""
-} 3
+  0:4 :: ""
+} 4
+
+restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:4 :: ""
+} 1
 
 restricted:
 CCTK_INT ML_BSSN_Minkowski_calc_every "ML_BSSN_Minkowski_calc_every"
diff --git a/ML_BSSN/schedule.ccl b/ML_BSSN/schedule.ccl
index ede1876..4b0d77e 100644
--- a/ML_BSSN/schedule.ccl
+++ b/ML_BSSN/schedule.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 STORAGE: ML_cons_detg[1]
@@ -14,24 +11,6 @@ STORAGE: ML_Ham[1]
 
 STORAGE: ML_mom[1]
 
-STORAGE: ML_curvrhs[1]
-
-STORAGE: ML_dtlapserhs[1]
-
-STORAGE: ML_dtshiftrhs[1]
-
-STORAGE: ML_Gammarhs[1]
-
-STORAGE: ML_lapserhs[1]
-
-STORAGE: ML_log_confacrhs[1]
-
-STORAGE: ML_metricrhs[1]
-
-STORAGE: ML_shiftrhs[1]
-
-STORAGE: ML_trace_curvrhs[1]
-
 if (timelevels == 1)
 {
   STORAGE: ML_curv[1]
@@ -44,6 +23,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_curv[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_curv[4]
+}
 
 if (timelevels == 1)
 {
@@ -57,6 +40,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_dtlapse[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_dtlapse[4]
+}
 
 if (timelevels == 1)
 {
@@ -70,6 +57,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_dtshift[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_dtshift[4]
+}
 
 if (timelevels == 1)
 {
@@ -83,6 +74,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_Gamma[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_Gamma[4]
+}
 
 if (timelevels == 1)
 {
@@ -96,6 +91,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_lapse[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_lapse[4]
+}
 
 if (timelevels == 1)
 {
@@ -109,6 +108,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_log_confac[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_log_confac[4]
+}
 
 if (timelevels == 1)
 {
@@ -122,6 +125,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_metric[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_metric[4]
+}
 
 if (timelevels == 1)
 {
@@ -135,6 +142,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_shift[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_shift[4]
+}
 
 if (timelevels == 1)
 {
@@ -148,6 +159,163 @@ if (timelevels == 3)
 {
   STORAGE: ML_trace_curv[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_trace_curv[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_curvrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_curvrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtlapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtlapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtlapserhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_dtlapserhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtshiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtshiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtshiftrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_dtshiftrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_Gammarhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_Gammarhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_Gammarhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_Gammarhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_lapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_lapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_lapserhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_lapserhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_log_confacrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_log_confacrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_log_confacrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_log_confacrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_metricrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_metricrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_metricrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_metricrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_shiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_shiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_shiftrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_shiftrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_trace_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_trace_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_trace_curvrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_trace_curvrhs[4]
+}
 
 schedule ML_BSSN_Startup at STARTUP
 {
diff --git a/ML_BSSN/src/Boundaries.c b/ML_BSSN/src/Boundaries.c
index 5e9f131..7680861 100644
--- a/ML_BSSN/src/Boundaries.c
+++ b/ML_BSSN/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c b/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
index bdbf119..779d151 100644
--- a/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
+++ b/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_Minkowski.c b/ML_BSSN/src/ML_BSSN_Minkowski.c
index 252203f..8108734 100644
--- a/ML_BSSN/src/ML_BSSN_Minkowski.c
+++ b/ML_BSSN/src/ML_BSSN_Minkowski.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_RHS.c b/ML_BSSN/src/ML_BSSN_RHS.c
index 7a8ece1..d387557 100644
--- a/ML_BSSN/src/ML_BSSN_RHS.c
+++ b/ML_BSSN/src/ML_BSSN_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_RHSBoundary.c b/ML_BSSN/src/ML_BSSN_RHSBoundary.c
index 6342d9e..3458ffc 100644
--- a/ML_BSSN/src/ML_BSSN_RHSBoundary.c
+++ b/ML_BSSN/src/ML_BSSN_RHSBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_boundary.c b/ML_BSSN/src/ML_BSSN_boundary.c
index 19eab96..a949ca0 100644
--- a/ML_BSSN/src/ML_BSSN_boundary.c
+++ b/ML_BSSN/src/ML_BSSN_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_constraints.c b/ML_BSSN/src/ML_BSSN_constraints.c
index d1172c9..136079e 100644
--- a/ML_BSSN/src/ML_BSSN_constraints.c
+++ b/ML_BSSN/src/ML_BSSN_constraints.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_constraints_boundary.c b/ML_BSSN/src/ML_BSSN_constraints_boundary.c
index 58dd3d7..97e44da 100644
--- a/ML_BSSN/src/ML_BSSN_constraints_boundary.c
+++ b/ML_BSSN/src/ML_BSSN_constraints_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
index 0069275..056573d 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
index 5cab341..d16d1ae 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBase.c b/ML_BSSN/src/ML_BSSN_convertToADMBase.c
index b8da0fa..d8ded4b 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBase.c
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_enforce.c b/ML_BSSN/src/ML_BSSN_enforce.c
index 8b13526..482a59b 100644
--- a/ML_BSSN/src/ML_BSSN_enforce.c
+++ b/ML_BSSN/src/ML_BSSN_enforce.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/RegisterMoL.c b/ML_BSSN/src/RegisterMoL.c
index bcb85df..f02fa5c 100644
--- a/ML_BSSN/src/RegisterMoL.c
+++ b/ML_BSSN/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN/src/RegisterSymmetries.c b/ML_BSSN/src/RegisterSymmetries.c
index aa538b4..20db895 100644
--- a/ML_BSSN/src/RegisterSymmetries.c
+++ b/ML_BSSN/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN/src/Startup.c b/ML_BSSN/src/Startup.c
index ea54655..705a850 100644
--- a/ML_BSSN/src/Startup.c
+++ b/ML_BSSN/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_BSSN/src/make.code.defn b/ML_BSSN/src/make.code.defn
index fe24c3c..33f6bba 100644
--- a/ML_BSSN/src/make.code.defn
+++ b/ML_BSSN/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_Minkowski.c ML_BSSN_convertFromADMBase.c ML_BSSN_convertFromADMBaseGamma.c ML_BSSN_RHS.c ML_BSSN_RHSBoundary.c ML_BSSN_enforce.c ML_BSSN_boundary.c ML_BSSN_convertToADMBase.c ML_BSSN_ADMBaseBoundary.c ML_BSSN_constraints.c ML_BSSN_constraints_boundary.c Boundaries.c 
diff --git a/ML_BSSN6/configuration.ccl b/ML_BSSN6/configuration.ccl
index 290ba20..148a1a1 100644
--- a/ML_BSSN6/configuration.ccl
+++ b/ML_BSSN6/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_BSSN6/interface.ccl b/ML_BSSN6/interface.ccl
index 7a6c933..4b9a76a 100644
--- a/ML_BSSN6/interface.ccl
+++ b/ML_BSSN6/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_BSSN6
 
@@ -62,76 +59,6 @@ CCTK_REAL mom type=GF timelevels=1 tags='tensortypealias="D" tensorweight=1.0000
 } "mom"
 
 public:
-CCTK_REAL ML_curvrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  At11rhs,
-  At12rhs,
-  At13rhs,
-  At22rhs,
-  At23rhs,
-  At33rhs
-} "ML_curvrhs"
-
-public:
-CCTK_REAL ML_dtlapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  Arhs
-} "ML_dtlapserhs"
-
-public:
-CCTK_REAL ML_dtshiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  B1rhs,
-  B2rhs,
-  B3rhs
-} "ML_dtshiftrhs"
-
-public:
-CCTK_REAL ML_Gammarhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
-{
-  Xt1rhs,
-  Xt2rhs,
-  Xt3rhs
-} "ML_Gammarhs"
-
-public:
-CCTK_REAL ML_lapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  alpharhs
-} "ML_lapserhs"
-
-public:
-CCTK_REAL ML_log_confacrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
-{
-  phirhs
-} "ML_log_confacrhs"
-
-public:
-CCTK_REAL ML_metricrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  gt11rhs,
-  gt12rhs,
-  gt13rhs,
-  gt22rhs,
-  gt23rhs,
-  gt33rhs
-} "ML_metricrhs"
-
-public:
-CCTK_REAL ML_shiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  beta1rhs,
-  beta2rhs,
-  beta3rhs
-} "ML_shiftrhs"
-
-public:
-CCTK_REAL ML_trace_curvrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  trKrhs
-} "ML_trace_curvrhs"
-
-public:
 CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   At11,
@@ -200,3 +127,73 @@ CCTK_REAL ML_trace_curv type=GF timelevels=3 tags='tensortypealias="Scalar" tens
 {
   trK
 } "ML_trace_curv"
+
+public:
+CCTK_REAL ML_curvrhs type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  At11rhs,
+  At12rhs,
+  At13rhs,
+  At22rhs,
+  At23rhs,
+  At33rhs
+} "ML_curvrhs"
+
+public:
+CCTK_REAL ML_dtlapserhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  Arhs
+} "ML_dtlapserhs"
+
+public:
+CCTK_REAL ML_dtshiftrhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  B1rhs,
+  B2rhs,
+  B3rhs
+} "ML_dtshiftrhs"
+
+public:
+CCTK_REAL ML_Gammarhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+{
+  Xt1rhs,
+  Xt2rhs,
+  Xt3rhs
+} "ML_Gammarhs"
+
+public:
+CCTK_REAL ML_lapserhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  alpharhs
+} "ML_lapserhs"
+
+public:
+CCTK_REAL ML_log_confacrhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
+{
+  phirhs
+} "ML_log_confacrhs"
+
+public:
+CCTK_REAL ML_metricrhs type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  gt11rhs,
+  gt12rhs,
+  gt13rhs,
+  gt22rhs,
+  gt23rhs,
+  gt33rhs
+} "ML_metricrhs"
+
+public:
+CCTK_REAL ML_shiftrhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  beta1rhs,
+  beta2rhs,
+  beta3rhs
+} "ML_shiftrhs"
+
+public:
+CCTK_REAL ML_trace_curvrhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  trKrhs
+} "ML_trace_curvrhs"
diff --git a/ML_BSSN6/param.ccl b/ML_BSSN6/param.ccl
index ae45644..e69734e 100644
--- a/ML_BSSN6/param.ccl
+++ b/ML_BSSN6/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: ADMBase
@@ -120,6 +117,12 @@ CCTK_INT timelevels "Number of active timelevels"
 } 3
 
 restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSN6_Minkowski_calc_every "ML_BSSN6_Minkowski_calc_every"
 {
   *:* :: ""
diff --git a/ML_BSSN6/schedule.ccl b/ML_BSSN6/schedule.ccl
index aae66ec..3dd4ce8 100644
--- a/ML_BSSN6/schedule.ccl
+++ b/ML_BSSN6/schedule.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 STORAGE: cons_detg[1]
@@ -14,24 +11,6 @@ STORAGE: Ham[1]
 
 STORAGE: mom[1]
 
-STORAGE: ML_curvrhs[1]
-
-STORAGE: ML_dtlapserhs[1]
-
-STORAGE: ML_dtshiftrhs[1]
-
-STORAGE: ML_Gammarhs[1]
-
-STORAGE: ML_lapserhs[1]
-
-STORAGE: ML_log_confacrhs[1]
-
-STORAGE: ML_metricrhs[1]
-
-STORAGE: ML_shiftrhs[1]
-
-STORAGE: ML_trace_curvrhs[1]
-
 if (timelevels == 1)
 {
   STORAGE: ML_curv[1]
@@ -149,6 +128,123 @@ if (timelevels == 3)
   STORAGE: ML_trace_curv[3]
 }
 
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_curvrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtlapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtlapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtlapserhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtshiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtshiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtshiftrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_Gammarhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_Gammarhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_Gammarhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_lapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_lapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_lapserhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_log_confacrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_log_confacrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_log_confacrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_metricrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_metricrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_metricrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_shiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_shiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_shiftrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_trace_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_trace_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_trace_curvrhs[3]
+}
+
 schedule ML_BSSN6_Startup at STARTUP
 {
   LANG: C
diff --git a/ML_BSSN6/src/Boundaries.c b/ML_BSSN6/src/Boundaries.c
index 080769f..c4282a5 100644
--- a/ML_BSSN6/src/Boundaries.c
+++ b/ML_BSSN6/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN6/src/ML_BSSN6_ADMBaseBoundary.c b/ML_BSSN6/src/ML_BSSN6_ADMBaseBoundary.c
index 28075b9..9e0dfc2 100644
--- a/ML_BSSN6/src/ML_BSSN6_ADMBaseBoundary.c
+++ b/ML_BSSN6/src/ML_BSSN6_ADMBaseBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_Minkowski.c b/ML_BSSN6/src/ML_BSSN6_Minkowski.c
index f0103ba..b7b6e5b 100644
--- a/ML_BSSN6/src/ML_BSSN6_Minkowski.c
+++ b/ML_BSSN6/src/ML_BSSN6_Minkowski.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_RHS.c b/ML_BSSN6/src/ML_BSSN6_RHS.c
index 57d5bba..fb20897 100644
--- a/ML_BSSN6/src/ML_BSSN6_RHS.c
+++ b/ML_BSSN6/src/ML_BSSN6_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_boundary.c b/ML_BSSN6/src/ML_BSSN6_boundary.c
index c4da8a1..d8edc04 100644
--- a/ML_BSSN6/src/ML_BSSN6_boundary.c
+++ b/ML_BSSN6/src/ML_BSSN6_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_constraints.c b/ML_BSSN6/src/ML_BSSN6_constraints.c
index 06d69e7..7763bad 100644
--- a/ML_BSSN6/src/ML_BSSN6_constraints.c
+++ b/ML_BSSN6/src/ML_BSSN6_constraints.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_constraints_boundary.c b/ML_BSSN6/src/ML_BSSN6_constraints_boundary.c
index 68b3d4a..7c1afe3 100644
--- a/ML_BSSN6/src/ML_BSSN6_constraints_boundary.c
+++ b/ML_BSSN6/src/ML_BSSN6_constraints_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_convertFromADMBase.c b/ML_BSSN6/src/ML_BSSN6_convertFromADMBase.c
index c7fd1ae..e82fa2e 100644
--- a/ML_BSSN6/src/ML_BSSN6_convertFromADMBase.c
+++ b/ML_BSSN6/src/ML_BSSN6_convertFromADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_convertFromADMBaseGamma.c b/ML_BSSN6/src/ML_BSSN6_convertFromADMBaseGamma.c
index 386790f..c3d6d53 100644
--- a/ML_BSSN6/src/ML_BSSN6_convertFromADMBaseGamma.c
+++ b/ML_BSSN6/src/ML_BSSN6_convertFromADMBaseGamma.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_convertToADMBase.c b/ML_BSSN6/src/ML_BSSN6_convertToADMBase.c
index 977bd91..c98b156 100644
--- a/ML_BSSN6/src/ML_BSSN6_convertToADMBase.c
+++ b/ML_BSSN6/src/ML_BSSN6_convertToADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/ML_BSSN6_enforce.c b/ML_BSSN6/src/ML_BSSN6_enforce.c
index bcbe385..1853235 100644
--- a/ML_BSSN6/src/ML_BSSN6_enforce.c
+++ b/ML_BSSN6/src/ML_BSSN6_enforce.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN6/src/RegisterMoL.c b/ML_BSSN6/src/RegisterMoL.c
index ddf1249..79f9aaa 100644
--- a/ML_BSSN6/src/RegisterMoL.c
+++ b/ML_BSSN6/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN6/src/RegisterSymmetries.c b/ML_BSSN6/src/RegisterSymmetries.c
index 72e50c7..65a1884 100644
--- a/ML_BSSN6/src/RegisterSymmetries.c
+++ b/ML_BSSN6/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN6/src/Startup.c b/ML_BSSN6/src/Startup.c
index eb6c71a..5f2d4e9 100644
--- a/ML_BSSN6/src/Startup.c
+++ b/ML_BSSN6/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_BSSN6/src/make.code.defn b/ML_BSSN6/src/make.code.defn
index b874f85..ee74b00 100644
--- a/ML_BSSN6/src/make.code.defn
+++ b/ML_BSSN6/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN6_Minkowski.c ML_BSSN6_convertFromADMBase.c ML_BSSN6_convertFromADMBaseGamma.c ML_BSSN6_RHS.c ML_BSSN6_enforce.c ML_BSSN6_boundary.c ML_BSSN6_convertToADMBase.c ML_BSSN6_ADMBaseBoundary.c ML_BSSN6_constraints.c ML_BSSN6_constraints_boundary.c Boundaries.c 
diff --git a/ML_BSSN6_Helper/interface.ccl b/ML_BSSN6_Helper/interface.ccl
index 21440f9..64ed9b1 100644
--- a/ML_BSSN6_Helper/interface.ccl
+++ b/ML_BSSN6_Helper/interface.ccl
@@ -6,5 +6,32 @@ USES INCLUDE: Symmetry.h
 
 
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+CCTK_INT FUNCTION MoLRegisterConstrainedGroup \
+    (CCTK_INT IN ConstrainedIndex)
+USES FUNCTION MoLRegisterConstrainedGroup
+
+CCTK_INT FUNCTION                         \
+    Boundary_SelectGroupForBC             \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+          CCTK_INT IN faces,              \
+          CCTK_INT IN boundary_width,     \
+          CCTK_INT IN table_handle,       \
+          CCTK_STRING IN group_name,      \
+          CCTK_STRING IN bc_name)
 USES FUNCTION Boundary_SelectGroupForBC
+
+CCTK_INT FUNCTION                         \
+    ExtrapolateGammas                     \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY INOUT var)
+USES FUNCTION ExtrapolateGammas
+
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+USES FUNCTION NewRad_Apply
diff --git a/ML_BSSN6_Helper/param.ccl b/ML_BSSN6_Helper/param.ccl
index 3c374fe..0ed7257 100644
--- a/ML_BSSN6_Helper/param.ccl
+++ b/ML_BSSN6_Helper/param.ccl
@@ -1,3 +1,7 @@
+SHARES: Boundary
+
+USES CCTK_INT radpower
+
 SHARES: MethodofLines
 
 USES CCTK_INT MoL_Num_Constrained_Vars
@@ -15,6 +19,13 @@ SHARES: ML_BSSN6
 USES CCTK_INT timelevels
 USES KEYWORD calculate_ADMBase_variables_at
 
+USES CCTK_REAL harmonicF
+
+EXTENDS KEYWORD my_rhs_boundary_condition
+{
+  "NewRad" :: "NewRad"
+}
+
 PRIVATE:
 
 CCTK_INT ML_BSSN6_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
diff --git a/ML_BSSN6_Helper/schedule.ccl b/ML_BSSN6_Helper/schedule.ccl
index 99f7fad..591655b 100644
--- a/ML_BSSN6_Helper/schedule.ccl
+++ b/ML_BSSN6_Helper/schedule.ccl
@@ -62,6 +62,33 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN6")) {
   
   
   
+  if (CCTK_EQUALS (my_rhs_boundary_condition, "NewRad"))
+  {
+    SCHEDULE ML_BSSN6_ExtrapolateGammas AT initial AFTER ML_BSSN6_convertFromADMBaseGamma
+    {
+      LANG: C
+      SYNC: ML_Gamma
+      SYNC: ML_dtlapse
+      SYNC: ML_dtshift
+    } "Extrapolate Gammas and time derivatives of lapse and shift"
+    
+    SCHEDULE ML_BSSN6_NewRad IN ML_BSSN6_evolCalcGroup AFTER ML_BSSN6_RHS
+    {
+      LANG: C
+      SYNC: ML_curvrhs
+      SYNC: ML_dtlapserhs
+      SYNC: ML_dtshiftrhs
+      SYNC: ML_Gammarhs
+      SYNC: ML_lapserhs
+      SYNC: ML_log_confacrhs
+      SYNC: ML_metricrhs
+      SYNC: ML_shiftrhs
+      SYNC: ML_trace_curvrhs
+    } "Apply NewRad boundary conditions to RHS"
+  }
+  
+  
+  
   SCHEDULE GROUP ML_BSSN6_convertToADMBaseGroup IN ML_BSSN6_convertToADMBaseGroupWrapper
   {
   } "Calculate ADM variables"
diff --git a/ML_BSSN6_Helper/src/ExtrapolateGammas.c b/ML_BSSN6_Helper/src/ExtrapolateGammas.c
new file mode 100644
index 0000000..e7e51dd
--- /dev/null
+++ b/ML_BSSN6_Helper/src/ExtrapolateGammas.c
@@ -0,0 +1,29 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+
+static void
+extrap (cGH const * restrict cctkGH,
+        CCTK_REAL * restrict var);
+
+void
+ML_BSSN6_ExtrapolateGammas (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  
+  extrap (cctkGH, Xt1);
+  extrap (cctkGH, Xt2);
+  extrap (cctkGH, Xt3);
+  
+  extrap (cctkGH, A);
+  
+  extrap (cctkGH, B1);
+  extrap (cctkGH, B2);
+  extrap (cctkGH, B3);
+}
+
+static void
+extrap (cGH const * restrict const cctkGH,
+        CCTK_REAL * restrict const var)
+{
+  ExtrapolateGammas (cctkGH, var);
+}
diff --git a/ML_BSSN6_Helper/src/NewRad.c b/ML_BSSN6_Helper/src/NewRad.c
new file mode 100644
index 0000000..7762059
--- /dev/null
+++ b/ML_BSSN6_Helper/src/NewRad.c
@@ -0,0 +1,67 @@
+#include <math.h>
+
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
+
+static void
+newrad (cGH const * restrict cctkGH,
+        CCTK_REAL const * restrict var,
+        CCTK_REAL * restrict rhs,
+        CCTK_REAL var0,
+        CCTK_REAL v0);
+
+void
+ML_BSSN6_NewRad (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  CCTK_REAL const v0 = sqrt (harmonicF);
+  
+  newrad (cctkGH, phi  , phirhs  , 0.0, v0 );
+  
+  newrad (cctkGH, gt11 , gt11rhs , 1.0, 1.0);
+  newrad (cctkGH, gt12 , gt12rhs , 0.0, 1.0);
+  newrad (cctkGH, gt13 , gt13rhs , 0.0, 1.0);
+  newrad (cctkGH, gt22 , gt22rhs , 1.0, 1.0);
+  newrad (cctkGH, gt23 , gt23rhs , 0.0, 1.0);
+  newrad (cctkGH, gt33 , gt33rhs , 1.0, 1.0);
+  
+  newrad (cctkGH, Xt1  , Xt1rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt2  , Xt2rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt3  , Xt3rhs  , 0.0, 1.0);
+  
+  newrad (cctkGH, trK  , trKrhs  , 0.0, v0 );
+  
+  newrad (cctkGH, At11 , At11rhs , 0.0, 1.0);
+  newrad (cctkGH, At12 , At12rhs , 0.0, 1.0);
+  newrad (cctkGH, At13 , At13rhs , 0.0, 1.0);
+  newrad (cctkGH, At22 , At22rhs , 0.0, 1.0);
+  newrad (cctkGH, At23 , At23rhs , 0.0, 1.0);
+  newrad (cctkGH, At33 , At33rhs , 0.0, 1.0);
+  
+  newrad (cctkGH, alpha, alpharhs, 1.0, v0 );
+  
+  newrad (cctkGH, A    , Arhs    , 0.0, v0 );
+  
+  newrad (cctkGH, beta1, beta1rhs, 0.0, 1.0);
+  newrad (cctkGH, beta2, beta2rhs, 0.0, 1.0);
+  newrad (cctkGH, beta3, beta3rhs, 0.0, 1.0);
+  
+  newrad (cctkGH, B1   , B1rhs   , 0.0, 1.0);
+  newrad (cctkGH, B2   , B2rhs   , 0.0, 1.0);
+  newrad (cctkGH, B3   , B3rhs   , 0.0, 1.0);
+}
+
+static void
+newrad (cGH const * restrict const cctkGH,
+        CCTK_REAL const * restrict const var,
+        CCTK_REAL * restrict const rhs,
+        CCTK_REAL const var0,
+        CCTK_REAL const v0)
+{
+  DECLARE_CCTK_PARAMETERS;
+  
+  NewRad_Apply (cctkGH, var, rhs, var0, v0, radpower);
+}
diff --git a/ML_BSSN6_Helper/src/make.code.defn b/ML_BSSN6_Helper/src/make.code.defn
index dcfe66e..7cc4e72 100644
--- a/ML_BSSN6_Helper/src/make.code.defn
+++ b/ML_BSSN6_Helper/src/make.code.defn
@@ -1,3 +1,3 @@
 # -*-Makefile-*-
-SRCS = RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
+SRCS = ExtrapolateGammas.c NewRad.c RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
 #  CopyADMBase.c
diff --git a/ML_BSSNUp/configuration.ccl b/ML_BSSNUp/configuration.ccl
index 290ba20..148a1a1 100644
--- a/ML_BSSNUp/configuration.ccl
+++ b/ML_BSSNUp/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_BSSNUp/interface.ccl b/ML_BSSNUp/interface.ccl
index 943ec3e..59ea157 100644
--- a/ML_BSSNUp/interface.ccl
+++ b/ML_BSSNUp/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_BSSNUp
 
@@ -62,76 +59,6 @@ CCTK_REAL mom type=GF timelevels=1 tags='tensortypealias="D" tensorweight=1.0000
 } "mom"
 
 public:
-CCTK_REAL ML_curvrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  At11rhs,
-  At12rhs,
-  At13rhs,
-  At22rhs,
-  At23rhs,
-  At33rhs
-} "ML_curvrhs"
-
-public:
-CCTK_REAL ML_dtlapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  Arhs
-} "ML_dtlapserhs"
-
-public:
-CCTK_REAL ML_dtshiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  B1rhs,
-  B2rhs,
-  B3rhs
-} "ML_dtshiftrhs"
-
-public:
-CCTK_REAL ML_Gammarhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
-{
-  Xt1rhs,
-  Xt2rhs,
-  Xt3rhs
-} "ML_Gammarhs"
-
-public:
-CCTK_REAL ML_lapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  alpharhs
-} "ML_lapserhs"
-
-public:
-CCTK_REAL ML_log_confacrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
-{
-  phirhs
-} "ML_log_confacrhs"
-
-public:
-CCTK_REAL ML_metricrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  gt11rhs,
-  gt12rhs,
-  gt13rhs,
-  gt22rhs,
-  gt23rhs,
-  gt33rhs
-} "ML_metricrhs"
-
-public:
-CCTK_REAL ML_shiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  beta1rhs,
-  beta2rhs,
-  beta3rhs
-} "ML_shiftrhs"
-
-public:
-CCTK_REAL ML_trace_curvrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  trKrhs
-} "ML_trace_curvrhs"
-
-public:
 CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   At11,
@@ -200,3 +127,73 @@ CCTK_REAL ML_trace_curv type=GF timelevels=3 tags='tensortypealias="Scalar" tens
 {
   trK
 } "ML_trace_curv"
+
+public:
+CCTK_REAL ML_curvrhs type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  At11rhs,
+  At12rhs,
+  At13rhs,
+  At22rhs,
+  At23rhs,
+  At33rhs
+} "ML_curvrhs"
+
+public:
+CCTK_REAL ML_dtlapserhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  Arhs
+} "ML_dtlapserhs"
+
+public:
+CCTK_REAL ML_dtshiftrhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  B1rhs,
+  B2rhs,
+  B3rhs
+} "ML_dtshiftrhs"
+
+public:
+CCTK_REAL ML_Gammarhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+{
+  Xt1rhs,
+  Xt2rhs,
+  Xt3rhs
+} "ML_Gammarhs"
+
+public:
+CCTK_REAL ML_lapserhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  alpharhs
+} "ML_lapserhs"
+
+public:
+CCTK_REAL ML_log_confacrhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
+{
+  phirhs
+} "ML_log_confacrhs"
+
+public:
+CCTK_REAL ML_metricrhs type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  gt11rhs,
+  gt12rhs,
+  gt13rhs,
+  gt22rhs,
+  gt23rhs,
+  gt33rhs
+} "ML_metricrhs"
+
+public:
+CCTK_REAL ML_shiftrhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  beta1rhs,
+  beta2rhs,
+  beta3rhs
+} "ML_shiftrhs"
+
+public:
+CCTK_REAL ML_trace_curvrhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  trKrhs
+} "ML_trace_curvrhs"
diff --git a/ML_BSSNUp/param.ccl b/ML_BSSNUp/param.ccl
index 8f771d4..542cdd7 100644
--- a/ML_BSSNUp/param.ccl
+++ b/ML_BSSNUp/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: ADMBase
@@ -120,6 +117,12 @@ CCTK_INT timelevels "Number of active timelevels"
 } 3
 
 restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSNUp_Minkowski_calc_every "ML_BSSNUp_Minkowski_calc_every"
 {
   *:* :: ""
diff --git a/ML_BSSNUp/schedule.ccl b/ML_BSSNUp/schedule.ccl
index c45eb87..bd0056f 100644
--- a/ML_BSSNUp/schedule.ccl
+++ b/ML_BSSNUp/schedule.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 STORAGE: cons_detg[1]
@@ -14,24 +11,6 @@ STORAGE: Ham[1]
 
 STORAGE: mom[1]
 
-STORAGE: ML_curvrhs[1]
-
-STORAGE: ML_dtlapserhs[1]
-
-STORAGE: ML_dtshiftrhs[1]
-
-STORAGE: ML_Gammarhs[1]
-
-STORAGE: ML_lapserhs[1]
-
-STORAGE: ML_log_confacrhs[1]
-
-STORAGE: ML_metricrhs[1]
-
-STORAGE: ML_shiftrhs[1]
-
-STORAGE: ML_trace_curvrhs[1]
-
 if (timelevels == 1)
 {
   STORAGE: ML_curv[1]
@@ -149,6 +128,123 @@ if (timelevels == 3)
   STORAGE: ML_trace_curv[3]
 }
 
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_curvrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtlapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtlapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtlapserhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtshiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtshiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtshiftrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_Gammarhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_Gammarhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_Gammarhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_lapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_lapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_lapserhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_log_confacrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_log_confacrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_log_confacrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_metricrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_metricrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_metricrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_shiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_shiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_shiftrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_trace_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_trace_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_trace_curvrhs[3]
+}
+
 schedule ML_BSSNUp_Startup at STARTUP
 {
   LANG: C
diff --git a/ML_BSSNUp/src/Boundaries.c b/ML_BSSNUp/src/Boundaries.c
index 3c69a2d..e78e3a1 100644
--- a/ML_BSSNUp/src/Boundaries.c
+++ b/ML_BSSNUp/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSNUp/src/ML_BSSNUp_ADMBaseBoundary.c b/ML_BSSNUp/src/ML_BSSNUp_ADMBaseBoundary.c
index f81e08f..b01daa5 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_ADMBaseBoundary.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_ADMBaseBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_Minkowski.c b/ML_BSSNUp/src/ML_BSSNUp_Minkowski.c
index 929eaee..dc6fb5e 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_Minkowski.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_Minkowski.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_RHS.c b/ML_BSSNUp/src/ML_BSSNUp_RHS.c
index 38c59ff..dabf428 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_RHS.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT c
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT c
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_boundary.c b/ML_BSSNUp/src/ML_BSSNUp_boundary.c
index 1f5f30b..ed744f7 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_boundary.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_constraints.c b/ML_BSSNUp/src/ML_BSSNUp_constraints.c
index d81bf8f..18496b9 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_constraints.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_constraints.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CC
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CC
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_constraints_boundary.c b/ML_BSSNUp/src/ML_BSSNUp_constraints_boundary.c
index ba803ac..6beb5f6 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_constraints_boundary.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_constraints_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT cons
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT cons
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_convertFromADMBase.c b/ML_BSSNUp/src/ML_BSSNUp_convertFromADMBase.c
index f3e9acb..a4bb341 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_convertFromADMBase.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_convertFromADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_convertFromADMBaseGamma.c b/ML_BSSNUp/src/ML_BSSNUp_convertFromADMBaseGamma.c
index be9d811..1ebdcb9 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_convertFromADMBaseGamma.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_convertFromADMBaseGamma.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT c
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT c
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_convertToADMBase.c b/ML_BSSNUp/src/ML_BSSNUp_convertToADMBase.c
index 9233bbf..8168ab4 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_convertToADMBase.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_convertToADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const di
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const di
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/ML_BSSNUp_enforce.c b/ML_BSSNUp/src/ML_BSSNUp_enforce.c
index 651d35f..279c4b7 100644
--- a/ML_BSSNUp/src/ML_BSSNUp_enforce.c
+++ b/ML_BSSNUp/src/ML_BSSNUp_enforce.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNUp_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_I
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23343 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23359 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23375 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23391 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23407 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23423 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23395 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23411 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23427 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23443 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23459 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23475 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNUp_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_I
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23343 = Differencing_Private_num$23343*Differencing_Private_ss$23343*INV(Differencing_Private_den$23343);
-  Differencing`Private`liName$23359 = Differencing_Private_num$23359*Differencing_Private_ss$23359*INV(Differencing_Private_den$23359);
-  Differencing`Private`liName$23375 = Differencing_Private_num$23375*Differencing_Private_ss$23375*INV(Differencing_Private_den$23375);
-  Differencing`Private`liName$23391 = Differencing_Private_num$23391*Differencing_Private_ss$23391*INV(Differencing_Private_den$23391);
-  Differencing`Private`liName$23407 = Differencing_Private_num$23407*Differencing_Private_ss$23407*INV(Differencing_Private_den$23407);
-  Differencing`Private`liName$23423 = Differencing_Private_num$23423*Differencing_Private_ss$23423*INV(Differencing_Private_den$23423);
+  Differencing`Private`liName$23395 = Differencing_Private_num$23395*Differencing_Private_ss$23395*INV(Differencing_Private_den$23395);
+  Differencing`Private`liName$23411 = Differencing_Private_num$23411*Differencing_Private_ss$23411*INV(Differencing_Private_den$23411);
+  Differencing`Private`liName$23427 = Differencing_Private_num$23427*Differencing_Private_ss$23427*INV(Differencing_Private_den$23427);
+  Differencing`Private`liName$23443 = Differencing_Private_num$23443*Differencing_Private_ss$23443*INV(Differencing_Private_den$23443);
+  Differencing`Private`liName$23459 = Differencing_Private_num$23459*Differencing_Private_ss$23459*INV(Differencing_Private_den$23459);
+  Differencing`Private`liName$23475 = Differencing_Private_num$23475*Differencing_Private_ss$23475*INV(Differencing_Private_den$23475);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNUp/src/RegisterMoL.c b/ML_BSSNUp/src/RegisterMoL.c
index 1af1141..8fca856 100644
--- a/ML_BSSNUp/src/RegisterMoL.c
+++ b/ML_BSSNUp/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSNUp/src/RegisterSymmetries.c b/ML_BSSNUp/src/RegisterSymmetries.c
index 56e931f..632b5c5 100644
--- a/ML_BSSNUp/src/RegisterSymmetries.c
+++ b/ML_BSSNUp/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSNUp/src/Startup.c b/ML_BSSNUp/src/Startup.c
index 53e5132..9dd48d5 100644
--- a/ML_BSSNUp/src/Startup.c
+++ b/ML_BSSNUp/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_BSSNUp/src/make.code.defn b/ML_BSSNUp/src/make.code.defn
index ed54dfa..fc99a9b 100644
--- a/ML_BSSNUp/src/make.code.defn
+++ b/ML_BSSNUp/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSNUp_Minkowski.c ML_BSSNUp_convertFromADMBase.c ML_BSSNUp_convertFromADMBaseGamma.c ML_BSSNUp_RHS.c ML_BSSNUp_enforce.c ML_BSSNUp_boundary.c ML_BSSNUp_convertToADMBase.c ML_BSSNUp_ADMBaseBoundary.c ML_BSSNUp_constraints.c ML_BSSNUp_constraints_boundary.c Boundaries.c 
diff --git a/ML_BSSNUp_Helper/interface.ccl b/ML_BSSNUp_Helper/interface.ccl
index 27ca40a..ec0f8aa 100644
--- a/ML_BSSNUp_Helper/interface.ccl
+++ b/ML_BSSNUp_Helper/interface.ccl
@@ -6,5 +6,32 @@ USES INCLUDE: Symmetry.h
 
 
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+CCTK_INT FUNCTION MoLRegisterConstrainedGroup \
+    (CCTK_INT IN ConstrainedIndex)
+USES FUNCTION MoLRegisterConstrainedGroup
+
+CCTK_INT FUNCTION                         \
+    Boundary_SelectGroupForBC             \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+          CCTK_INT IN faces,              \
+          CCTK_INT IN boundary_width,     \
+          CCTK_INT IN table_handle,       \
+          CCTK_STRING IN group_name,      \
+          CCTK_STRING IN bc_name)
 USES FUNCTION Boundary_SelectGroupForBC
+
+CCTK_INT FUNCTION                         \
+    ExtrapolateGammas                     \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY INOUT var)
+USES FUNCTION ExtrapolateGammas
+
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+USES FUNCTION NewRad_Apply
diff --git a/ML_BSSNUp_Helper/param.ccl b/ML_BSSNUp_Helper/param.ccl
index 7d4632d..69171a4 100644
--- a/ML_BSSNUp_Helper/param.ccl
+++ b/ML_BSSNUp_Helper/param.ccl
@@ -1,3 +1,7 @@
+SHARES: Boundary
+
+USES CCTK_INT radpower
+
 SHARES: MethodofLines
 
 USES CCTK_INT MoL_Num_Constrained_Vars
@@ -15,6 +19,13 @@ SHARES: ML_BSSNUp
 USES CCTK_INT timelevels
 USES KEYWORD calculate_ADMBase_variables_at
 
+USES CCTK_REAL harmonicF
+
+EXTENDS KEYWORD my_rhs_boundary_condition
+{
+  "NewRad" :: "NewRad"
+}
+
 PRIVATE:
 
 CCTK_INT ML_BSSNUp_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
diff --git a/ML_BSSNUp_Helper/schedule.ccl b/ML_BSSNUp_Helper/schedule.ccl
index 901e59b..ab8d735 100644
--- a/ML_BSSNUp_Helper/schedule.ccl
+++ b/ML_BSSNUp_Helper/schedule.ccl
@@ -62,6 +62,33 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSNUp")) {
   
   
   
+  if (CCTK_EQUALS (my_rhs_boundary_condition, "NewRad"))
+  {
+    SCHEDULE ML_BSSNUp_ExtrapolateGammas AT initial AFTER ML_BSSNUp_convertFromADMBaseGamma
+    {
+      LANG: C
+      SYNC: ML_Gamma
+      SYNC: ML_dtlapse
+      SYNC: ML_dtshift
+    } "Extrapolate Gammas and time derivatives of lapse and shift"
+    
+    SCHEDULE ML_BSSNUp_NewRad IN ML_BSSNUp_evolCalcGroup AFTER ML_BSSNUp_RHS
+    {
+      LANG: C
+      SYNC: ML_curvrhs
+      SYNC: ML_dtlapserhs
+      SYNC: ML_dtshiftrhs
+      SYNC: ML_Gammarhs
+      SYNC: ML_lapserhs
+      SYNC: ML_log_confacrhs
+      SYNC: ML_metricrhs
+      SYNC: ML_shiftrhs
+      SYNC: ML_trace_curvrhs
+    } "Apply NewRad boundary conditions to RHS"
+  }
+  
+  
+  
   SCHEDULE GROUP ML_BSSNUp_convertToADMBaseGroup IN ML_BSSNUp_convertToADMBaseGroupWrapper
   {
   } "Calculate ADM variables"
diff --git a/ML_BSSNUp_Helper/src/ExtrapolateGammas.c b/ML_BSSNUp_Helper/src/ExtrapolateGammas.c
new file mode 100644
index 0000000..3fcb48a
--- /dev/null
+++ b/ML_BSSNUp_Helper/src/ExtrapolateGammas.c
@@ -0,0 +1,29 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+
+static void
+extrap (cGH const * restrict cctkGH,
+        CCTK_REAL * restrict var);
+
+void
+ML_BSSNUp_ExtrapolateGammas (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  
+  extrap (cctkGH, Xt1);
+  extrap (cctkGH, Xt2);
+  extrap (cctkGH, Xt3);
+  
+  extrap (cctkGH, A);
+  
+  extrap (cctkGH, B1);
+  extrap (cctkGH, B2);
+  extrap (cctkGH, B3);
+}
+
+static void
+extrap (cGH const * restrict const cctkGH,
+        CCTK_REAL * restrict const var)
+{
+  ExtrapolateGammas (cctkGH, var);
+}
diff --git a/ML_BSSNUp_Helper/src/NewRad.c b/ML_BSSNUp_Helper/src/NewRad.c
new file mode 100644
index 0000000..e8c9d18
--- /dev/null
+++ b/ML_BSSNUp_Helper/src/NewRad.c
@@ -0,0 +1,67 @@
+#include <math.h>
+
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
+
+static void
+newrad (cGH const * restrict cctkGH,
+        CCTK_REAL const * restrict var,
+        CCTK_REAL * restrict rhs,
+        CCTK_REAL var0,
+        CCTK_REAL v0);
+
+void
+ML_BSSNUp_NewRad (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  CCTK_REAL const v0 = sqrt (harmonicF);
+  
+  newrad (cctkGH, phi  , phirhs  , 0.0, v0 );
+  
+  newrad (cctkGH, gt11 , gt11rhs , 1.0, 1.0);
+  newrad (cctkGH, gt12 , gt12rhs , 0.0, 1.0);
+  newrad (cctkGH, gt13 , gt13rhs , 0.0, 1.0);
+  newrad (cctkGH, gt22 , gt22rhs , 1.0, 1.0);
+  newrad (cctkGH, gt23 , gt23rhs , 0.0, 1.0);
+  newrad (cctkGH, gt33 , gt33rhs , 1.0, 1.0);
+  
+  newrad (cctkGH, Xt1  , Xt1rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt2  , Xt2rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt3  , Xt3rhs  , 0.0, 1.0);
+  
+  newrad (cctkGH, trK  , trKrhs  , 0.0, v0 );
+  
+  newrad (cctkGH, At11 , At11rhs , 0.0, 1.0);
+  newrad (cctkGH, At12 , At12rhs , 0.0, 1.0);
+  newrad (cctkGH, At13 , At13rhs , 0.0, 1.0);
+  newrad (cctkGH, At22 , At22rhs , 0.0, 1.0);
+  newrad (cctkGH, At23 , At23rhs , 0.0, 1.0);
+  newrad (cctkGH, At33 , At33rhs , 0.0, 1.0);
+  
+  newrad (cctkGH, alpha, alpharhs, 1.0, v0 );
+  
+  newrad (cctkGH, A    , Arhs    , 0.0, v0 );
+  
+  newrad (cctkGH, beta1, beta1rhs, 0.0, 1.0);
+  newrad (cctkGH, beta2, beta2rhs, 0.0, 1.0);
+  newrad (cctkGH, beta3, beta3rhs, 0.0, 1.0);
+  
+  newrad (cctkGH, B1   , B1rhs   , 0.0, 1.0);
+  newrad (cctkGH, B2   , B2rhs   , 0.0, 1.0);
+  newrad (cctkGH, B3   , B3rhs   , 0.0, 1.0);
+}
+
+static void
+newrad (cGH const * restrict const cctkGH,
+        CCTK_REAL const * restrict const var,
+        CCTK_REAL * restrict const rhs,
+        CCTK_REAL const var0,
+        CCTK_REAL const v0)
+{
+  DECLARE_CCTK_PARAMETERS;
+  
+  NewRad_Apply (cctkGH, var, rhs, var0, v0, radpower);
+}
diff --git a/ML_BSSNUp_Helper/src/make.code.defn b/ML_BSSNUp_Helper/src/make.code.defn
index dcfe66e..7cc4e72 100644
--- a/ML_BSSNUp_Helper/src/make.code.defn
+++ b/ML_BSSNUp_Helper/src/make.code.defn
@@ -1,3 +1,3 @@
 # -*-Makefile-*-
-SRCS = RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
+SRCS = ExtrapolateGammas.c NewRad.c RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
 #  CopyADMBase.c
diff --git a/ML_BSSNW/configuration.ccl b/ML_BSSNW/configuration.ccl
index 290ba20..148a1a1 100644
--- a/ML_BSSNW/configuration.ccl
+++ b/ML_BSSNW/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_BSSNW/interface.ccl b/ML_BSSNW/interface.ccl
index b818b24..eaf9362 100644
--- a/ML_BSSNW/interface.ccl
+++ b/ML_BSSNW/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_BSSNW
 
@@ -62,76 +59,6 @@ CCTK_REAL mom type=GF timelevels=1 tags='tensortypealias="D" tensorweight=1.0000
 } "mom"
 
 public:
-CCTK_REAL ML_curvrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  At11rhs,
-  At12rhs,
-  At13rhs,
-  At22rhs,
-  At23rhs,
-  At33rhs
-} "ML_curvrhs"
-
-public:
-CCTK_REAL ML_dtlapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  Arhs
-} "ML_dtlapserhs"
-
-public:
-CCTK_REAL ML_dtshiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  B1rhs,
-  B2rhs,
-  B3rhs
-} "ML_dtshiftrhs"
-
-public:
-CCTK_REAL ML_Gammarhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
-{
-  Xt1rhs,
-  Xt2rhs,
-  Xt3rhs
-} "ML_Gammarhs"
-
-public:
-CCTK_REAL ML_lapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  alpharhs
-} "ML_lapserhs"
-
-public:
-CCTK_REAL ML_metricrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  gt11rhs,
-  gt12rhs,
-  gt13rhs,
-  gt22rhs,
-  gt23rhs,
-  gt33rhs
-} "ML_metricrhs"
-
-public:
-CCTK_REAL ML_shiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  beta1rhs,
-  beta2rhs,
-  beta3rhs
-} "ML_shiftrhs"
-
-public:
-CCTK_REAL ML_trace_curvrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  trKrhs
-} "ML_trace_curvrhs"
-
-public:
-CCTK_REAL ML_Wrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=-0.33333333333333333333'
-{
-  Wrhs
-} "ML_Wrhs"
-
-public:
 CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   At11,
@@ -200,3 +127,73 @@ CCTK_REAL ML_W type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=
 {
   W
 } "ML_W"
+
+public:
+CCTK_REAL ML_curvrhs type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  At11rhs,
+  At12rhs,
+  At13rhs,
+  At22rhs,
+  At23rhs,
+  At33rhs
+} "ML_curvrhs"
+
+public:
+CCTK_REAL ML_dtlapserhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  Arhs
+} "ML_dtlapserhs"
+
+public:
+CCTK_REAL ML_dtshiftrhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  B1rhs,
+  B2rhs,
+  B3rhs
+} "ML_dtshiftrhs"
+
+public:
+CCTK_REAL ML_Gammarhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+{
+  Xt1rhs,
+  Xt2rhs,
+  Xt3rhs
+} "ML_Gammarhs"
+
+public:
+CCTK_REAL ML_lapserhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  alpharhs
+} "ML_lapserhs"
+
+public:
+CCTK_REAL ML_metricrhs type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  gt11rhs,
+  gt12rhs,
+  gt13rhs,
+  gt22rhs,
+  gt23rhs,
+  gt33rhs
+} "ML_metricrhs"
+
+public:
+CCTK_REAL ML_shiftrhs type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  beta1rhs,
+  beta2rhs,
+  beta3rhs
+} "ML_shiftrhs"
+
+public:
+CCTK_REAL ML_trace_curvrhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  trKrhs
+} "ML_trace_curvrhs"
+
+public:
+CCTK_REAL ML_Wrhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=-0.33333333333333333333'
+{
+  Wrhs
+} "ML_Wrhs"
diff --git a/ML_BSSNW/param.ccl b/ML_BSSNW/param.ccl
index 5bf5d99..ae8d90b 100644
--- a/ML_BSSNW/param.ccl
+++ b/ML_BSSNW/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: ADMBase
@@ -120,6 +117,12 @@ CCTK_INT timelevels "Number of active timelevels"
 } 3
 
 restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSNW_Minkowski_calc_every "ML_BSSNW_Minkowski_calc_every"
 {
   *:* :: ""
diff --git a/ML_BSSNW/schedule.ccl b/ML_BSSNW/schedule.ccl
index e243119..3c1a865 100644
--- a/ML_BSSNW/schedule.ccl
+++ b/ML_BSSNW/schedule.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 STORAGE: cons_detg[1]
@@ -14,24 +11,6 @@ STORAGE: Ham[1]
 
 STORAGE: mom[1]
 
-STORAGE: ML_curvrhs[1]
-
-STORAGE: ML_dtlapserhs[1]
-
-STORAGE: ML_dtshiftrhs[1]
-
-STORAGE: ML_Gammarhs[1]
-
-STORAGE: ML_lapserhs[1]
-
-STORAGE: ML_metricrhs[1]
-
-STORAGE: ML_shiftrhs[1]
-
-STORAGE: ML_trace_curvrhs[1]
-
-STORAGE: ML_Wrhs[1]
-
 if (timelevels == 1)
 {
   STORAGE: ML_curv[1]
@@ -149,6 +128,123 @@ if (timelevels == 3)
   STORAGE: ML_W[3]
 }
 
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_curvrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtlapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtlapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtlapserhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtshiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtshiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtshiftrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_Gammarhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_Gammarhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_Gammarhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_lapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_lapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_lapserhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_metricrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_metricrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_metricrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_shiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_shiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_shiftrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_trace_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_trace_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_trace_curvrhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_Wrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_Wrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_Wrhs[3]
+}
+
 schedule ML_BSSNW_Startup at STARTUP
 {
   LANG: C
diff --git a/ML_BSSNW/src/Boundaries.c b/ML_BSSNW/src/Boundaries.c
index 67bd343..cfd3a72 100644
--- a/ML_BSSNW/src/Boundaries.c
+++ b/ML_BSSNW/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSNW/src/ML_BSSNW_ADMBaseBoundary.c b/ML_BSSNW/src/ML_BSSNW_ADMBaseBoundary.c
index 1d610fc..8150289 100644
--- a/ML_BSSNW/src/ML_BSSNW_ADMBaseBoundary.c
+++ b/ML_BSSNW/src/ML_BSSNW_ADMBaseBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir,
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir,
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_Minkowski.c b/ML_BSSNW/src/ML_BSSNW_Minkowski.c
index 27ca579..428dcd7 100644
--- a/ML_BSSNW/src/ML_BSSNW_Minkowski.c
+++ b/ML_BSSNW/src/ML_BSSNW_Minkowski.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_RHS.c b/ML_BSSNW/src/ML_BSSNW_RHS.c
index 4ebf4ed..11fb77b 100644
--- a/ML_BSSNW/src/ML_BSSNW_RHS.c
+++ b/ML_BSSNW/src/ML_BSSNW_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT co
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT co
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_boundary.c b/ML_BSSNW/src/ML_BSSNW_boundary.c
index b228ee3..b213ea1 100644
--- a/ML_BSSNW/src/ML_BSSNW_boundary.c
+++ b/ML_BSSNW/src/ML_BSSNW_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_I
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_I
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_constraints.c b/ML_BSSNW/src/ML_BSSNW_constraints.c
index 1042b92..2c70540 100644
--- a/ML_BSSNW/src/ML_BSSNW_constraints.c
+++ b/ML_BSSNW/src/ML_BSSNW_constraints.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCT
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCT
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_constraints_boundary.c b/ML_BSSNW/src/ML_BSSNW_constraints_boundary.c
index 117f5b9..fc4ca1c 100644
--- a/ML_BSSNW/src/ML_BSSNW_constraints_boundary.c
+++ b/ML_BSSNW/src/ML_BSSNW_constraints_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT const
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT const
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_convertFromADMBase.c b/ML_BSSNW/src/ML_BSSNW_convertFromADMBase.c
index ed3552c..23c3eb8 100644
--- a/ML_BSSNW/src/ML_BSSNW_convertFromADMBase.c
+++ b/ML_BSSNW/src/ML_BSSNW_convertFromADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const d
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const d
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_convertFromADMBaseGamma.c b/ML_BSSNW/src/ML_BSSNW_convertFromADMBaseGamma.c
index 062c6f0..2a9d402 100644
--- a/ML_BSSNW/src/ML_BSSNW_convertFromADMBaseGamma.c
+++ b/ML_BSSNW/src/ML_BSSNW_convertFromADMBaseGamma.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT co
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT co
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_convertToADMBase.c b/ML_BSSNW/src/ML_BSSNW_convertToADMBase.c
index 181a14e..4754607 100644
--- a/ML_BSSNW/src/ML_BSSNW_convertToADMBase.c
+++ b/ML_BSSNW/src/ML_BSSNW_convertToADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/ML_BSSNW_enforce.c b/ML_BSSNW/src/ML_BSSNW_enforce.c
index 55df288..b1b3eb9 100644
--- a/ML_BSSNW/src/ML_BSSNW_enforce.c
+++ b/ML_BSSNW/src/ML_BSSNW_enforce.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -46,12 +43,12 @@ void ML_BSSNW_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23695 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23711 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23727 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23743 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23759 = INITVALUE;
-  CCTK_REAL Differencing`Private`liName$23775 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23747 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23763 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23779 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23795 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23811 = INITVALUE;
+  CCTK_REAL Differencing`Private`liName$23827 = INITVALUE;
   
   if (verbose > 1)
   {
@@ -91,12 +88,12 @@ void ML_BSSNW_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  Differencing`Private`liName$23695 = Differencing_Private_num$23695*Differencing_Private_ss$23695*INV(Differencing_Private_den$23695);
-  Differencing`Private`liName$23711 = Differencing_Private_num$23711*Differencing_Private_ss$23711*INV(Differencing_Private_den$23711);
-  Differencing`Private`liName$23727 = Differencing_Private_num$23727*Differencing_Private_ss$23727*INV(Differencing_Private_den$23727);
-  Differencing`Private`liName$23743 = Differencing_Private_num$23743*Differencing_Private_ss$23743*INV(Differencing_Private_den$23743);
-  Differencing`Private`liName$23759 = Differencing_Private_num$23759*Differencing_Private_ss$23759*INV(Differencing_Private_den$23759);
-  Differencing`Private`liName$23775 = Differencing_Private_num$23775*Differencing_Private_ss$23775*INV(Differencing_Private_den$23775);
+  Differencing`Private`liName$23747 = Differencing_Private_num$23747*Differencing_Private_ss$23747*INV(Differencing_Private_den$23747);
+  Differencing`Private`liName$23763 = Differencing_Private_num$23763*Differencing_Private_ss$23763*INV(Differencing_Private_den$23763);
+  Differencing`Private`liName$23779 = Differencing_Private_num$23779*Differencing_Private_ss$23779*INV(Differencing_Private_den$23779);
+  Differencing`Private`liName$23795 = Differencing_Private_num$23795*Differencing_Private_ss$23795*INV(Differencing_Private_den$23795);
+  Differencing`Private`liName$23811 = Differencing_Private_num$23811*Differencing_Private_ss$23811*INV(Differencing_Private_den$23811);
+  Differencing`Private`liName$23827 = Differencing_Private_num$23827*Differencing_Private_ss$23827*INV(Differencing_Private_den$23827);
   
   /* Loop over the grid points */
   #pragma omp parallel
diff --git a/ML_BSSNW/src/RegisterMoL.c b/ML_BSSNW/src/RegisterMoL.c
index 8903de5..fc2a29e 100644
--- a/ML_BSSNW/src/RegisterMoL.c
+++ b/ML_BSSNW/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSNW/src/RegisterSymmetries.c b/ML_BSSNW/src/RegisterSymmetries.c
index 32fcd79..b5fcd11 100644
--- a/ML_BSSNW/src/RegisterSymmetries.c
+++ b/ML_BSSNW/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSNW/src/Startup.c b/ML_BSSNW/src/Startup.c
index a210c26..51bc4da 100644
--- a/ML_BSSNW/src/Startup.c
+++ b/ML_BSSNW/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_BSSNW/src/make.code.defn b/ML_BSSNW/src/make.code.defn
index 308f456..0710a3c 100644
--- a/ML_BSSNW/src/make.code.defn
+++ b/ML_BSSNW/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSNW_Minkowski.c ML_BSSNW_convertFromADMBase.c ML_BSSNW_convertFromADMBaseGamma.c ML_BSSNW_RHS.c ML_BSSNW_enforce.c ML_BSSNW_boundary.c ML_BSSNW_convertToADMBase.c ML_BSSNW_ADMBaseBoundary.c ML_BSSNW_constraints.c ML_BSSNW_constraints_boundary.c Boundaries.c 
diff --git a/ML_BSSNW_Helper/interface.ccl b/ML_BSSNW_Helper/interface.ccl
index 80858f5..7af6590 100644
--- a/ML_BSSNW_Helper/interface.ccl
+++ b/ML_BSSNW_Helper/interface.ccl
@@ -6,5 +6,32 @@ USES INCLUDE: Symmetry.h
 
 
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+CCTK_INT FUNCTION MoLRegisterConstrainedGroup \
+    (CCTK_INT IN ConstrainedIndex)
+USES FUNCTION MoLRegisterConstrainedGroup
+
+CCTK_INT FUNCTION                         \
+    Boundary_SelectGroupForBC             \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+          CCTK_INT IN faces,              \
+          CCTK_INT IN boundary_width,     \
+          CCTK_INT IN table_handle,       \
+          CCTK_STRING IN group_name,      \
+          CCTK_STRING IN bc_name)
 USES FUNCTION Boundary_SelectGroupForBC
+
+CCTK_INT FUNCTION                         \
+    ExtrapolateGammas                     \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY INOUT var)
+USES FUNCTION ExtrapolateGammas
+
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+USES FUNCTION NewRad_Apply
diff --git a/ML_BSSNW_Helper/param.ccl b/ML_BSSNW_Helper/param.ccl
index ac8b7c0..db55695 100644
--- a/ML_BSSNW_Helper/param.ccl
+++ b/ML_BSSNW_Helper/param.ccl
@@ -1,3 +1,7 @@
+SHARES: Boundary
+
+USES CCTK_INT radpower
+
 SHARES: MethodofLines
 
 USES CCTK_INT MoL_Num_Constrained_Vars
@@ -15,6 +19,13 @@ SHARES: ML_BSSNW
 USES CCTK_INT timelevels
 USES KEYWORD calculate_ADMBase_variables_at
 
+USES CCTK_REAL harmonicF
+
+EXTENDS KEYWORD my_rhs_boundary_condition
+{
+  "NewRad" :: "NewRad"
+}
+
 PRIVATE:
 
 CCTK_INT ML_BSSNW_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
diff --git a/ML_BSSNW_Helper/schedule.ccl b/ML_BSSNW_Helper/schedule.ccl
index f4e4390..fe62667 100644
--- a/ML_BSSNW_Helper/schedule.ccl
+++ b/ML_BSSNW_Helper/schedule.ccl
@@ -62,6 +62,33 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSNW")) {
   
   
   
+  if (CCTK_EQUALS (my_rhs_boundary_condition, "NewRad"))
+  {
+    SCHEDULE ML_BSSNW_ExtrapolateGammas AT initial AFTER ML_BSSNW_convertFromADMBaseGamma
+    {
+      LANG: C
+      SYNC: ML_Gamma
+      SYNC: ML_dtlapse
+      SYNC: ML_dtshift
+    } "Extrapolate Gammas and time derivatives of lapse and shift"
+    
+    SCHEDULE ML_BSSNW_NewRad IN ML_BSSNW_evolCalcGroup AFTER ML_BSSNW_RHS
+    {
+      LANG: C
+      SYNC: ML_curvrhs
+      SYNC: ML_dtlapserhs
+      SYNC: ML_dtshiftrhs
+      SYNC: ML_Gammarhs
+      SYNC: ML_lapserhs
+      SYNC: ML_log_confacrhs
+      SYNC: ML_metricrhs
+      SYNC: ML_shiftrhs
+      SYNC: ML_trace_curvrhs
+    } "Apply NewRad boundary conditions to RHS"
+  }
+  
+  
+  
   SCHEDULE GROUP ML_BSSNW_convertToADMBaseGroup IN ML_BSSNW_convertToADMBaseGroupWrapper
   {
   } "Calculate ADM variables"
diff --git a/ML_BSSNW_Helper/src/ExtrapolateGammas.c b/ML_BSSNW_Helper/src/ExtrapolateGammas.c
new file mode 100644
index 0000000..9ae5deb
--- /dev/null
+++ b/ML_BSSNW_Helper/src/ExtrapolateGammas.c
@@ -0,0 +1,29 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+
+static void
+extrap (cGH const * restrict cctkGH,
+        CCTK_REAL * restrict var);
+
+void
+ML_BSSNW_ExtrapolateGammas (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  
+  extrap (cctkGH, Xt1);
+  extrap (cctkGH, Xt2);
+  extrap (cctkGH, Xt3);
+  
+  extrap (cctkGH, A);
+  
+  extrap (cctkGH, B1);
+  extrap (cctkGH, B2);
+  extrap (cctkGH, B3);
+}
+
+static void
+extrap (cGH const * restrict const cctkGH,
+        CCTK_REAL * restrict const var)
+{
+  ExtrapolateGammas (cctkGH, var);
+}
diff --git a/ML_BSSNW_Helper/src/NewRad.c b/ML_BSSNW_Helper/src/NewRad.c
new file mode 100644
index 0000000..f08edb7
--- /dev/null
+++ b/ML_BSSNW_Helper/src/NewRad.c
@@ -0,0 +1,67 @@
+#include <math.h>
+
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
+
+static void
+newrad (cGH const * restrict cctkGH,
+        CCTK_REAL const * restrict var,
+        CCTK_REAL * restrict rhs,
+        CCTK_REAL var0,
+        CCTK_REAL v0);
+
+void
+ML_BSSNW_NewRad (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  CCTK_REAL const v0 = sqrt (harmonicF);
+  
+  newrad (cctkGH, phi  , phirhs  , 0.0, v0 );
+  
+  newrad (cctkGH, gt11 , gt11rhs , 1.0, 1.0);
+  newrad (cctkGH, gt12 , gt12rhs , 0.0, 1.0);
+  newrad (cctkGH, gt13 , gt13rhs , 0.0, 1.0);
+  newrad (cctkGH, gt22 , gt22rhs , 1.0, 1.0);
+  newrad (cctkGH, gt23 , gt23rhs , 0.0, 1.0);
+  newrad (cctkGH, gt33 , gt33rhs , 1.0, 1.0);
+  
+  newrad (cctkGH, Xt1  , Xt1rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt2  , Xt2rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt3  , Xt3rhs  , 0.0, 1.0);
+  
+  newrad (cctkGH, trK  , trKrhs  , 0.0, v0 );
+  
+  newrad (cctkGH, At11 , At11rhs , 0.0, 1.0);
+  newrad (cctkGH, At12 , At12rhs , 0.0, 1.0);
+  newrad (cctkGH, At13 , At13rhs , 0.0, 1.0);
+  newrad (cctkGH, At22 , At22rhs , 0.0, 1.0);
+  newrad (cctkGH, At23 , At23rhs , 0.0, 1.0);
+  newrad (cctkGH, At33 , At33rhs , 0.0, 1.0);
+  
+  newrad (cctkGH, alpha, alpharhs, 1.0, v0 );
+  
+  newrad (cctkGH, A    , Arhs    , 0.0, v0 );
+  
+  newrad (cctkGH, beta1, beta1rhs, 0.0, 1.0);
+  newrad (cctkGH, beta2, beta2rhs, 0.0, 1.0);
+  newrad (cctkGH, beta3, beta3rhs, 0.0, 1.0);
+  
+  newrad (cctkGH, B1   , B1rhs   , 0.0, 1.0);
+  newrad (cctkGH, B2   , B2rhs   , 0.0, 1.0);
+  newrad (cctkGH, B3   , B3rhs   , 0.0, 1.0);
+}
+
+static void
+newrad (cGH const * restrict const cctkGH,
+        CCTK_REAL const * restrict const var,
+        CCTK_REAL * restrict const rhs,
+        CCTK_REAL const var0,
+        CCTK_REAL const v0)
+{
+  DECLARE_CCTK_PARAMETERS;
+  
+  NewRad_Apply (cctkGH, var, rhs, var0, v0, radpower);
+}
diff --git a/ML_BSSNW_Helper/src/make.code.defn b/ML_BSSNW_Helper/src/make.code.defn
index dcfe66e..7cc4e72 100644
--- a/ML_BSSNW_Helper/src/make.code.defn
+++ b/ML_BSSNW_Helper/src/make.code.defn
@@ -1,3 +1,3 @@
 # -*-Makefile-*-
-SRCS = RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
+SRCS = ExtrapolateGammas.c NewRad.c RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
 #  CopyADMBase.c
diff --git a/ML_BSSN_Helper/interface.ccl b/ML_BSSN_Helper/interface.ccl
index 8ad9ba2..4c57f29 100644
--- a/ML_BSSN_Helper/interface.ccl
+++ b/ML_BSSN_Helper/interface.ccl
@@ -6,5 +6,32 @@ USES INCLUDE: Symmetry.h
 
 
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+CCTK_INT FUNCTION MoLRegisterConstrainedGroup \
+    (CCTK_INT IN ConstrainedIndex)
+USES FUNCTION MoLRegisterConstrainedGroup
+
+CCTK_INT FUNCTION                         \
+    Boundary_SelectGroupForBC             \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+          CCTK_INT IN faces,              \
+          CCTK_INT IN boundary_width,     \
+          CCTK_INT IN table_handle,       \
+          CCTK_STRING IN group_name,      \
+          CCTK_STRING IN bc_name)
 USES FUNCTION Boundary_SelectGroupForBC
+
+CCTK_INT FUNCTION                         \
+    ExtrapolateGammas                     \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY INOUT var)
+USES FUNCTION ExtrapolateGammas
+
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+USES FUNCTION NewRad_Apply
diff --git a/ML_BSSN_Helper/param.ccl b/ML_BSSN_Helper/param.ccl
index 605ea7a..338d0a2 100644
--- a/ML_BSSN_Helper/param.ccl
+++ b/ML_BSSN_Helper/param.ccl
@@ -1,3 +1,7 @@
+SHARES: Boundary
+
+USES CCTK_INT radpower
+
 SHARES: MethodofLines
 
 USES CCTK_INT MoL_Num_Constrained_Vars
@@ -15,6 +19,13 @@ SHARES: ML_BSSN
 USES CCTK_INT timelevels
 USES KEYWORD calculate_ADMBase_variables_at
 
+USES CCTK_REAL harmonicF
+
+EXTENDS KEYWORD my_rhs_boundary_condition
+{
+  "NewRad" :: "NewRad"
+}
+
 PRIVATE:
 
 CCTK_INT ML_BSSN_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
diff --git a/ML_BSSN_Helper/schedule.ccl b/ML_BSSN_Helper/schedule.ccl
index a2134a1..48bea28 100644
--- a/ML_BSSN_Helper/schedule.ccl
+++ b/ML_BSSN_Helper/schedule.ccl
@@ -62,6 +62,33 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN")) {
   
   
   
+  if (CCTK_EQUALS (my_rhs_boundary_condition, "NewRad"))
+  {
+    SCHEDULE ML_BSSN_ExtrapolateGammas AT initial AFTER ML_BSSN_convertFromADMBaseGamma
+    {
+      LANG: C
+      SYNC: ML_Gamma
+      SYNC: ML_dtlapse
+      SYNC: ML_dtshift
+    } "Extrapolate Gammas and time derivatives of lapse and shift"
+    
+    SCHEDULE ML_BSSN_NewRad IN ML_BSSN_evolCalcGroup AFTER ML_BSSN_RHS
+    {
+      LANG: C
+      SYNC: ML_curvrhs
+      SYNC: ML_dtlapserhs
+      SYNC: ML_dtshiftrhs
+      SYNC: ML_Gammarhs
+      SYNC: ML_lapserhs
+      SYNC: ML_log_confacrhs
+      SYNC: ML_metricrhs
+      SYNC: ML_shiftrhs
+      SYNC: ML_trace_curvrhs
+    } "Apply NewRad boundary conditions to RHS"
+  }
+  
+  
+  
   SCHEDULE GROUP ML_BSSN_convertToADMBaseGroup IN ML_BSSN_convertToADMBaseGroupWrapper
   {
   } "Calculate ADM variables"
diff --git a/ML_BSSN_Helper/src/ExtrapolateGammas.c b/ML_BSSN_Helper/src/ExtrapolateGammas.c
new file mode 100644
index 0000000..4e52e8f
--- /dev/null
+++ b/ML_BSSN_Helper/src/ExtrapolateGammas.c
@@ -0,0 +1,29 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+
+static void
+extrap (cGH const * restrict cctkGH,
+        CCTK_REAL * restrict var);
+
+void
+ML_BSSN_ExtrapolateGammas (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  
+  extrap (cctkGH, Xt1);
+  extrap (cctkGH, Xt2);
+  extrap (cctkGH, Xt3);
+  
+  extrap (cctkGH, A);
+  
+  extrap (cctkGH, B1);
+  extrap (cctkGH, B2);
+  extrap (cctkGH, B3);
+}
+
+static void
+extrap (cGH const * restrict const cctkGH,
+        CCTK_REAL * restrict const var)
+{
+  ExtrapolateGammas (cctkGH, var);
+}
diff --git a/ML_BSSN_Helper/src/NewRad.c b/ML_BSSN_Helper/src/NewRad.c
new file mode 100644
index 0000000..9c576a1
--- /dev/null
+++ b/ML_BSSN_Helper/src/NewRad.c
@@ -0,0 +1,67 @@
+#include <math.h>
+
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
+
+static void
+newrad (cGH const * restrict cctkGH,
+        CCTK_REAL const * restrict var,
+        CCTK_REAL * restrict rhs,
+        CCTK_REAL var0,
+        CCTK_REAL v0);
+
+void
+ML_BSSN_NewRad (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  CCTK_REAL const v0 = sqrt (harmonicF);
+  
+  newrad (cctkGH, phi  , phirhs  , 0.0, v0 );
+  
+  newrad (cctkGH, gt11 , gt11rhs , 1.0, 1.0);
+  newrad (cctkGH, gt12 , gt12rhs , 0.0, 1.0);
+  newrad (cctkGH, gt13 , gt13rhs , 0.0, 1.0);
+  newrad (cctkGH, gt22 , gt22rhs , 1.0, 1.0);
+  newrad (cctkGH, gt23 , gt23rhs , 0.0, 1.0);
+  newrad (cctkGH, gt33 , gt33rhs , 1.0, 1.0);
+  
+  newrad (cctkGH, Xt1  , Xt1rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt2  , Xt2rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt3  , Xt3rhs  , 0.0, 1.0);
+  
+  newrad (cctkGH, trK  , trKrhs  , 0.0, v0 );
+  
+  newrad (cctkGH, At11 , At11rhs , 0.0, 1.0);
+  newrad (cctkGH, At12 , At12rhs , 0.0, 1.0);
+  newrad (cctkGH, At13 , At13rhs , 0.0, 1.0);
+  newrad (cctkGH, At22 , At22rhs , 0.0, 1.0);
+  newrad (cctkGH, At23 , At23rhs , 0.0, 1.0);
+  newrad (cctkGH, At33 , At33rhs , 0.0, 1.0);
+  
+  newrad (cctkGH, alpha, alpharhs, 1.0, v0 );
+  
+  newrad (cctkGH, A    , Arhs    , 0.0, v0 );
+  
+  newrad (cctkGH, beta1, beta1rhs, 0.0, 1.0);
+  newrad (cctkGH, beta2, beta2rhs, 0.0, 1.0);
+  newrad (cctkGH, beta3, beta3rhs, 0.0, 1.0);
+  
+  newrad (cctkGH, B1   , B1rhs   , 0.0, 1.0);
+  newrad (cctkGH, B2   , B2rhs   , 0.0, 1.0);
+  newrad (cctkGH, B3   , B3rhs   , 0.0, 1.0);
+}
+
+static void
+newrad (cGH const * restrict const cctkGH,
+        CCTK_REAL const * restrict const var,
+        CCTK_REAL * restrict const rhs,
+        CCTK_REAL const var0,
+        CCTK_REAL const v0)
+{
+  DECLARE_CCTK_PARAMETERS;
+  
+  NewRad_Apply (cctkGH, var, rhs, var0, v0, radpower);
+}
diff --git a/ML_BSSN_Helper/src/make.code.defn b/ML_BSSN_Helper/src/make.code.defn
index dcfe66e..7cc4e72 100644
--- a/ML_BSSN_Helper/src/make.code.defn
+++ b/ML_BSSN_Helper/src/make.code.defn
@@ -1,3 +1,3 @@
 # -*-Makefile-*-
-SRCS = RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
+SRCS = ExtrapolateGammas.c NewRad.c RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
 #  CopyADMBase.c
diff --git a/ML_BSSN_M/configuration.ccl b/ML_BSSN_M/configuration.ccl
index 5fb01c5..148a1a1 100644
--- a/ML_BSSN_M/configuration.ccl
+++ b/ML_BSSN_M/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_BSSN_M/interface.ccl b/ML_BSSN_M/interface.ccl
index ca64e90..cb45630 100644
--- a/ML_BSSN_M/interface.ccl
+++ b/ML_BSSN_M/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_BSSN_M
 
@@ -62,77 +59,7 @@ CCTK_REAL ML_mom type=GF timelevels=1 tags='tensortypealias="D" tensorweight=1.0
 } "ML_mom"
 
 public:
-CCTK_REAL ML_curvrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  At11rhs,
-  At12rhs,
-  At13rhs,
-  At22rhs,
-  At23rhs,
-  At33rhs
-} "ML_curvrhs"
-
-public:
-CCTK_REAL ML_dtlapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  Arhs
-} "ML_dtlapserhs"
-
-public:
-CCTK_REAL ML_dtshiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  B1rhs,
-  B2rhs,
-  B3rhs
-} "ML_dtshiftrhs"
-
-public:
-CCTK_REAL ML_Gammarhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
-{
-  Xt1rhs,
-  Xt2rhs,
-  Xt3rhs
-} "ML_Gammarhs"
-
-public:
-CCTK_REAL ML_lapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  alpharhs
-} "ML_lapserhs"
-
-public:
-CCTK_REAL ML_log_confacrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
-{
-  phirhs
-} "ML_log_confacrhs"
-
-public:
-CCTK_REAL ML_metricrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  gt11rhs,
-  gt12rhs,
-  gt13rhs,
-  gt22rhs,
-  gt23rhs,
-  gt33rhs
-} "ML_metricrhs"
-
-public:
-CCTK_REAL ML_shiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  beta1rhs,
-  beta2rhs,
-  beta3rhs
-} "ML_shiftrhs"
-
-public:
-CCTK_REAL ML_trace_curvrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  trKrhs
-} "ML_trace_curvrhs"
-
-public:
-CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+CCTK_REAL ML_curv type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   At11,
   At12,
@@ -143,13 +70,13 @@ CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweig
 } "ML_curv"
 
 public:
-CCTK_REAL ML_dtlapse type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_dtlapse type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   A
 } "ML_dtlapse"
 
 public:
-CCTK_REAL ML_dtshift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_dtshift type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
 {
   B1,
   B2,
@@ -157,7 +84,7 @@ CCTK_REAL ML_dtshift type=GF timelevels=3 tags='tensortypealias="U" tensorweight
 } "ML_dtshift"
 
 public:
-CCTK_REAL ML_Gamma type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+CCTK_REAL ML_Gamma type=GF timelevels=4 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
 {
   Xt1,
   Xt2,
@@ -165,19 +92,19 @@ CCTK_REAL ML_Gamma type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0
 } "ML_Gamma"
 
 public:
-CCTK_REAL ML_lapse type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_lapse type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   alpha
 } "ML_lapse"
 
 public:
-CCTK_REAL ML_log_confac type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
+CCTK_REAL ML_log_confac type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
 {
   phi
 } "ML_log_confac"
 
 public:
-CCTK_REAL ML_metric type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+CCTK_REAL ML_metric type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   gt11,
   gt12,
@@ -188,7 +115,7 @@ CCTK_REAL ML_metric type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorwe
 } "ML_metric"
 
 public:
-CCTK_REAL ML_shift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_shift type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
 {
   beta1,
   beta2,
@@ -196,7 +123,77 @@ CCTK_REAL ML_shift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1
 } "ML_shift"
 
 public:
-CCTK_REAL ML_trace_curv type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_trace_curv type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   trK
 } "ML_trace_curv"
+
+public:
+CCTK_REAL ML_curvrhs type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  At11rhs,
+  At12rhs,
+  At13rhs,
+  At22rhs,
+  At23rhs,
+  At33rhs
+} "ML_curvrhs"
+
+public:
+CCTK_REAL ML_dtlapserhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  Arhs
+} "ML_dtlapserhs"
+
+public:
+CCTK_REAL ML_dtshiftrhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  B1rhs,
+  B2rhs,
+  B3rhs
+} "ML_dtshiftrhs"
+
+public:
+CCTK_REAL ML_Gammarhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+{
+  Xt1rhs,
+  Xt2rhs,
+  Xt3rhs
+} "ML_Gammarhs"
+
+public:
+CCTK_REAL ML_lapserhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  alpharhs
+} "ML_lapserhs"
+
+public:
+CCTK_REAL ML_log_confacrhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
+{
+  phirhs
+} "ML_log_confacrhs"
+
+public:
+CCTK_REAL ML_metricrhs type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  gt11rhs,
+  gt12rhs,
+  gt13rhs,
+  gt22rhs,
+  gt23rhs,
+  gt33rhs
+} "ML_metricrhs"
+
+public:
+CCTK_REAL ML_shiftrhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  beta1rhs,
+  beta2rhs,
+  beta3rhs
+} "ML_shiftrhs"
+
+public:
+CCTK_REAL ML_trace_curvrhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  trKrhs
+} "ML_trace_curvrhs"
diff --git a/ML_BSSN_M/param.ccl b/ML_BSSN_M/param.ccl
index 91ace5d..0592f38 100644
--- a/ML_BSSN_M/param.ccl
+++ b/ML_BSSN_M/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: ADMBase
@@ -106,7 +103,7 @@ KEYWORD my_initial_data "my_initial_data"
   "Minkowski" :: "Minkowski"
 } "ADMBase"
 
-private:
+restricted:
 KEYWORD my_rhs_boundary_condition "my_rhs_boundary_condition"
 {
   "none" :: "none"
@@ -137,8 +134,14 @@ CCTK_INT ML_BSSN_M_MaxNumEvolvedVars "Number of evolved variables used by this t
 restricted:
 CCTK_INT timelevels "Number of active timelevels"
 {
-  0:3 :: ""
-} 3
+  0:4 :: ""
+} 4
+
+restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:4 :: ""
+} 1
 
 restricted:
 CCTK_INT ML_BSSN_M_Minkowski_calc_every "ML_BSSN_M_Minkowski_calc_every"
diff --git a/ML_BSSN_M/schedule.ccl b/ML_BSSN_M/schedule.ccl
index bd48f11..1b46aef 100644
--- a/ML_BSSN_M/schedule.ccl
+++ b/ML_BSSN_M/schedule.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 STORAGE: ML_cons_detg[1]
@@ -14,24 +11,6 @@ STORAGE: ML_Ham[1]
 
 STORAGE: ML_mom[1]
 
-STORAGE: ML_curvrhs[1]
-
-STORAGE: ML_dtlapserhs[1]
-
-STORAGE: ML_dtshiftrhs[1]
-
-STORAGE: ML_Gammarhs[1]
-
-STORAGE: ML_lapserhs[1]
-
-STORAGE: ML_log_confacrhs[1]
-
-STORAGE: ML_metricrhs[1]
-
-STORAGE: ML_shiftrhs[1]
-
-STORAGE: ML_trace_curvrhs[1]
-
 if (timelevels == 1)
 {
   STORAGE: ML_curv[1]
@@ -44,6 +23,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_curv[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_curv[4]
+}
 
 if (timelevels == 1)
 {
@@ -57,6 +40,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_dtlapse[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_dtlapse[4]
+}
 
 if (timelevels == 1)
 {
@@ -70,6 +57,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_dtshift[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_dtshift[4]
+}
 
 if (timelevels == 1)
 {
@@ -83,6 +74,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_Gamma[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_Gamma[4]
+}
 
 if (timelevels == 1)
 {
@@ -96,6 +91,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_lapse[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_lapse[4]
+}
 
 if (timelevels == 1)
 {
@@ -109,6 +108,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_log_confac[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_log_confac[4]
+}
 
 if (timelevels == 1)
 {
@@ -122,6 +125,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_metric[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_metric[4]
+}
 
 if (timelevels == 1)
 {
@@ -135,6 +142,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_shift[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_shift[4]
+}
 
 if (timelevels == 1)
 {
@@ -148,6 +159,163 @@ if (timelevels == 3)
 {
   STORAGE: ML_trace_curv[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_trace_curv[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_curvrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_curvrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtlapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtlapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtlapserhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_dtlapserhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtshiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtshiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtshiftrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_dtshiftrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_Gammarhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_Gammarhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_Gammarhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_Gammarhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_lapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_lapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_lapserhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_lapserhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_log_confacrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_log_confacrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_log_confacrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_log_confacrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_metricrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_metricrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_metricrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_metricrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_shiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_shiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_shiftrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_shiftrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_trace_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_trace_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_trace_curvrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_trace_curvrhs[4]
+}
 
 schedule ML_BSSN_M_Startup at STARTUP
 {
diff --git a/ML_BSSN_M/src/Boundaries.c b/ML_BSSN_M/src/Boundaries.c
index e58615e..68bc54f 100644
--- a/ML_BSSN_M/src/Boundaries.c
+++ b/ML_BSSN_M/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN_M/src/ML_BSSN_M_ADMBaseBoundary.c b/ML_BSSN_M/src/ML_BSSN_M_ADMBaseBoundary.c
index 5bd07ed..670ec0c 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_ADMBaseBoundary.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_ADMBaseBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_Minkowski.c b/ML_BSSN_M/src/ML_BSSN_M_Minkowski.c
index 6ab56be..e552548 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_Minkowski.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_Minkowski.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_RHS.c b/ML_BSSN_M/src/ML_BSSN_M_RHS.c
index 20252fb..fe93508 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_RHS.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_RHSBoundary.c b/ML_BSSN_M/src/ML_BSSN_M_RHSBoundary.c
index 98fb34b..930b356 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_RHSBoundary.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_RHSBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_boundary.c b/ML_BSSN_M/src/ML_BSSN_M_boundary.c
index 83299b7..93ccb6c 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_boundary.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_constraints.c b/ML_BSSN_M/src/ML_BSSN_M_constraints.c
index bf6bf1f..95e7057 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_constraints.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_constraints.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_constraints_boundary.c b/ML_BSSN_M/src/ML_BSSN_M_constraints_boundary.c
index d022c6f..bc1d16b 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_constraints_boundary.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_constraints_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_convertFromADMBase.c b/ML_BSSN_M/src/ML_BSSN_M_convertFromADMBase.c
index 06e6a13..aa76038 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_convertFromADMBase.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_convertFromADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_convertFromADMBaseGamma.c b/ML_BSSN_M/src/ML_BSSN_M_convertFromADMBaseGamma.c
index 72db1ca..80a5368 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_convertFromADMBaseGamma.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_convertFromADMBaseGamma.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_convertToADMBase.c b/ML_BSSN_M/src/ML_BSSN_M_convertToADMBase.c
index d8967c9..7109969 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_convertToADMBase.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_convertToADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/ML_BSSN_M_enforce.c b/ML_BSSN_M/src/ML_BSSN_M_enforce.c
index 56975cc..6468062 100644
--- a/ML_BSSN_M/src/ML_BSSN_M_enforce.c
+++ b/ML_BSSN_M/src/ML_BSSN_M_enforce.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_M/src/RegisterMoL.c b/ML_BSSN_M/src/RegisterMoL.c
index 7599da9..8cd1553 100644
--- a/ML_BSSN_M/src/RegisterMoL.c
+++ b/ML_BSSN_M/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN_M/src/RegisterSymmetries.c b/ML_BSSN_M/src/RegisterSymmetries.c
index 311584f..1200325 100644
--- a/ML_BSSN_M/src/RegisterSymmetries.c
+++ b/ML_BSSN_M/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN_M/src/Startup.c b/ML_BSSN_M/src/Startup.c
index 1a99fd4..2f67a77 100644
--- a/ML_BSSN_M/src/Startup.c
+++ b/ML_BSSN_M/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_BSSN_M/src/make.code.defn b/ML_BSSN_M/src/make.code.defn
index 62edf3b..47c79f0 100644
--- a/ML_BSSN_M/src/make.code.defn
+++ b/ML_BSSN_M/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_M_Minkowski.c ML_BSSN_M_convertFromADMBase.c ML_BSSN_M_convertFromADMBaseGamma.c ML_BSSN_M_RHS.c ML_BSSN_M_RHSBoundary.c ML_BSSN_M_enforce.c ML_BSSN_M_boundary.c ML_BSSN_M_convertToADMBase.c ML_BSSN_M_ADMBaseBoundary.c ML_BSSN_M_constraints.c ML_BSSN_M_constraints_boundary.c Boundaries.c 
diff --git a/ML_BSSN_MP/configuration.ccl b/ML_BSSN_MP/configuration.ccl
index 5fb01c5..148a1a1 100644
--- a/ML_BSSN_MP/configuration.ccl
+++ b/ML_BSSN_MP/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_BSSN_MP/interface.ccl b/ML_BSSN_MP/interface.ccl
index c2161c8..8573da7 100644
--- a/ML_BSSN_MP/interface.ccl
+++ b/ML_BSSN_MP/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_BSSN_MP
 
@@ -62,77 +59,7 @@ CCTK_REAL ML_mom type=GF timelevels=1 tags='tensortypealias="D" tensorweight=1.0
 } "ML_mom"
 
 public:
-CCTK_REAL ML_curvrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  At11rhs,
-  At12rhs,
-  At13rhs,
-  At22rhs,
-  At23rhs,
-  At33rhs
-} "ML_curvrhs"
-
-public:
-CCTK_REAL ML_dtlapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  Arhs
-} "ML_dtlapserhs"
-
-public:
-CCTK_REAL ML_dtshiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  B1rhs,
-  B2rhs,
-  B3rhs
-} "ML_dtshiftrhs"
-
-public:
-CCTK_REAL ML_Gammarhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
-{
-  Xt1rhs,
-  Xt2rhs,
-  Xt3rhs
-} "ML_Gammarhs"
-
-public:
-CCTK_REAL ML_lapserhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  alpharhs
-} "ML_lapserhs"
-
-public:
-CCTK_REAL ML_log_confacrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
-{
-  phirhs
-} "ML_log_confacrhs"
-
-public:
-CCTK_REAL ML_metricrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
-{
-  gt11rhs,
-  gt12rhs,
-  gt13rhs,
-  gt22rhs,
-  gt23rhs,
-  gt33rhs
-} "ML_metricrhs"
-
-public:
-CCTK_REAL ML_shiftrhs type=GF timelevels=1 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
-{
-  beta1rhs,
-  beta2rhs,
-  beta3rhs
-} "ML_shiftrhs"
-
-public:
-CCTK_REAL ML_trace_curvrhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  trKrhs
-} "ML_trace_curvrhs"
-
-public:
-CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+CCTK_REAL ML_curv type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   At11,
   At12,
@@ -143,13 +70,13 @@ CCTK_REAL ML_curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweig
 } "ML_curv"
 
 public:
-CCTK_REAL ML_dtlapse type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_dtlapse type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   A
 } "ML_dtlapse"
 
 public:
-CCTK_REAL ML_dtshift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_dtshift type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
 {
   B1,
   B2,
@@ -157,7 +84,7 @@ CCTK_REAL ML_dtshift type=GF timelevels=3 tags='tensortypealias="U" tensorweight
 } "ML_dtshift"
 
 public:
-CCTK_REAL ML_Gamma type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+CCTK_REAL ML_Gamma type=GF timelevels=4 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
 {
   Xt1,
   Xt2,
@@ -165,19 +92,19 @@ CCTK_REAL ML_Gamma type=GF timelevels=3 tags='tensortypealias="U" tensorweight=0
 } "ML_Gamma"
 
 public:
-CCTK_REAL ML_lapse type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_lapse type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   alpha
 } "ML_lapse"
 
 public:
-CCTK_REAL ML_log_confac type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
+CCTK_REAL ML_log_confac type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
 {
   phi
 } "ML_log_confac"
 
 public:
-CCTK_REAL ML_metric type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+CCTK_REAL ML_metric type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
 {
   gt11,
   gt12,
@@ -188,7 +115,7 @@ CCTK_REAL ML_metric type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorwe
 } "ML_metric"
 
 public:
-CCTK_REAL ML_shift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_shift type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
 {
   beta1,
   beta2,
@@ -196,7 +123,77 @@ CCTK_REAL ML_shift type=GF timelevels=3 tags='tensortypealias="U" tensorweight=1
 } "ML_shift"
 
 public:
-CCTK_REAL ML_trace_curv type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+CCTK_REAL ML_trace_curv type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   trK
 } "ML_trace_curv"
+
+public:
+CCTK_REAL ML_curvrhs type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  At11rhs,
+  At12rhs,
+  At13rhs,
+  At22rhs,
+  At23rhs,
+  At33rhs
+} "ML_curvrhs"
+
+public:
+CCTK_REAL ML_dtlapserhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  Arhs
+} "ML_dtlapserhs"
+
+public:
+CCTK_REAL ML_dtshiftrhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  B1rhs,
+  B2rhs,
+  B3rhs
+} "ML_dtshiftrhs"
+
+public:
+CCTK_REAL ML_Gammarhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=0.66666666666666666667'
+{
+  Xt1rhs,
+  Xt2rhs,
+  Xt3rhs
+} "ML_Gammarhs"
+
+public:
+CCTK_REAL ML_lapserhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  alpharhs
+} "ML_lapserhs"
+
+public:
+CCTK_REAL ML_log_confacrhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=0.16666666666666666667'
+{
+  phirhs
+} "ML_log_confacrhs"
+
+public:
+CCTK_REAL ML_metricrhs type=GF timelevels=4 tags='tensortypealias="DD_sym" tensorweight=-0.66666666666666666667'
+{
+  gt11rhs,
+  gt12rhs,
+  gt13rhs,
+  gt22rhs,
+  gt23rhs,
+  gt33rhs
+} "ML_metricrhs"
+
+public:
+CCTK_REAL ML_shiftrhs type=GF timelevels=4 tags='tensortypealias="U" tensorweight=1.0000000000000000000'
+{
+  beta1rhs,
+  beta2rhs,
+  beta3rhs
+} "ML_shiftrhs"
+
+public:
+CCTK_REAL ML_trace_curvrhs type=GF timelevels=4 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  trKrhs
+} "ML_trace_curvrhs"
diff --git a/ML_BSSN_MP/param.ccl b/ML_BSSN_MP/param.ccl
index 49ffcc2..9ed8fb2 100644
--- a/ML_BSSN_MP/param.ccl
+++ b/ML_BSSN_MP/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: ADMBase
@@ -106,7 +103,7 @@ KEYWORD my_initial_data "my_initial_data"
   "Minkowski" :: "Minkowski"
 } "ADMBase"
 
-private:
+restricted:
 KEYWORD my_rhs_boundary_condition "my_rhs_boundary_condition"
 {
   "none" :: "none"
@@ -137,8 +134,14 @@ CCTK_INT ML_BSSN_MP_MaxNumEvolvedVars "Number of evolved variables used by this
 restricted:
 CCTK_INT timelevels "Number of active timelevels"
 {
-  0:3 :: ""
-} 3
+  0:4 :: ""
+} 4
+
+restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:4 :: ""
+} 1
 
 restricted:
 CCTK_INT ML_BSSN_MP_Minkowski_calc_every "ML_BSSN_MP_Minkowski_calc_every"
diff --git a/ML_BSSN_MP/schedule.ccl b/ML_BSSN_MP/schedule.ccl
index e027b2c..12a7d04 100644
--- a/ML_BSSN_MP/schedule.ccl
+++ b/ML_BSSN_MP/schedule.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 STORAGE: ML_cons_detg[1]
@@ -14,24 +11,6 @@ STORAGE: ML_Ham[1]
 
 STORAGE: ML_mom[1]
 
-STORAGE: ML_curvrhs[1]
-
-STORAGE: ML_dtlapserhs[1]
-
-STORAGE: ML_dtshiftrhs[1]
-
-STORAGE: ML_Gammarhs[1]
-
-STORAGE: ML_lapserhs[1]
-
-STORAGE: ML_log_confacrhs[1]
-
-STORAGE: ML_metricrhs[1]
-
-STORAGE: ML_shiftrhs[1]
-
-STORAGE: ML_trace_curvrhs[1]
-
 if (timelevels == 1)
 {
   STORAGE: ML_curv[1]
@@ -44,6 +23,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_curv[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_curv[4]
+}
 
 if (timelevels == 1)
 {
@@ -57,6 +40,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_dtlapse[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_dtlapse[4]
+}
 
 if (timelevels == 1)
 {
@@ -70,6 +57,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_dtshift[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_dtshift[4]
+}
 
 if (timelevels == 1)
 {
@@ -83,6 +74,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_Gamma[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_Gamma[4]
+}
 
 if (timelevels == 1)
 {
@@ -96,6 +91,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_lapse[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_lapse[4]
+}
 
 if (timelevels == 1)
 {
@@ -109,6 +108,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_log_confac[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_log_confac[4]
+}
 
 if (timelevels == 1)
 {
@@ -122,6 +125,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_metric[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_metric[4]
+}
 
 if (timelevels == 1)
 {
@@ -135,6 +142,10 @@ if (timelevels == 3)
 {
   STORAGE: ML_shift[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_shift[4]
+}
 
 if (timelevels == 1)
 {
@@ -148,6 +159,163 @@ if (timelevels == 3)
 {
   STORAGE: ML_trace_curv[3]
 }
+if (timelevels == 4)
+{
+  STORAGE: ML_trace_curv[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_curvrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_curvrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtlapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtlapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtlapserhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_dtlapserhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_dtshiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_dtshiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_dtshiftrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_dtshiftrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_Gammarhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_Gammarhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_Gammarhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_Gammarhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_lapserhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_lapserhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_lapserhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_lapserhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_log_confacrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_log_confacrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_log_confacrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_log_confacrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_metricrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_metricrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_metricrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_metricrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_shiftrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_shiftrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_shiftrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_shiftrhs[4]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: ML_trace_curvrhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ML_trace_curvrhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ML_trace_curvrhs[3]
+}
+if (rhs_timelevels == 4)
+{
+  STORAGE: ML_trace_curvrhs[4]
+}
 
 schedule ML_BSSN_MP_Startup at STARTUP
 {
diff --git a/ML_BSSN_MP/src/Boundaries.c b/ML_BSSN_MP/src/Boundaries.c
index 9f2df6a..86cdd53 100644
--- a/ML_BSSN_MP/src/Boundaries.c
+++ b/ML_BSSN_MP/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_ADMBaseBoundary.c b/ML_BSSN_MP/src/ML_BSSN_MP_ADMBaseBoundary.c
index 18fa188..14dba68 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_ADMBaseBoundary.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_ADMBaseBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c b/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c
index 6cac96d..df47800 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_RHS.c b/ML_BSSN_MP/src/ML_BSSN_MP_RHS.c
index d09b147..4f32a58 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_RHS.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_RHSBoundary.c b/ML_BSSN_MP/src/ML_BSSN_MP_RHSBoundary.c
index fe2ba06..ff72aa3 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_RHSBoundary.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_RHSBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_boundary.c b/ML_BSSN_MP/src/ML_BSSN_MP_boundary.c
index b5fe495..0d51b7c 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_boundary.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_constraints.c b/ML_BSSN_MP/src/ML_BSSN_MP_constraints.c
index defae32..309aed2 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_constraints.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_constraints.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_constraints_boundary.c b/ML_BSSN_MP/src/ML_BSSN_MP_constraints_boundary.c
index 5ee9a84..fe72526 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_constraints_boundary.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_constraints_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c
index 95723f0..53b1366 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c
index da178b1..e6c8836 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.c b/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.c
index 4ddda48..3a549d8 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_enforce.c b/ML_BSSN_MP/src/ML_BSSN_MP_enforce.c
index b6a8a75..3b8364e 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_enforce.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_enforce.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN_MP/src/RegisterMoL.c b/ML_BSSN_MP/src/RegisterMoL.c
index eadc7b2..c92e848 100644
--- a/ML_BSSN_MP/src/RegisterMoL.c
+++ b/ML_BSSN_MP/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN_MP/src/RegisterSymmetries.c b/ML_BSSN_MP/src/RegisterSymmetries.c
index 2e7de4f..e2081a6 100644
--- a/ML_BSSN_MP/src/RegisterSymmetries.c
+++ b/ML_BSSN_MP/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN_MP/src/Startup.c b/ML_BSSN_MP/src/Startup.c
index 1582347..98a9498 100644
--- a/ML_BSSN_MP/src/Startup.c
+++ b/ML_BSSN_MP/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_BSSN_MP/src/make.code.defn b/ML_BSSN_MP/src/make.code.defn
index 780a34c..3af787e 100644
--- a/ML_BSSN_MP/src/make.code.defn
+++ b/ML_BSSN_MP/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_MP_Minkowski.c ML_BSSN_MP_convertFromADMBase.c ML_BSSN_MP_convertFromADMBaseGamma.c ML_BSSN_MP_RHS.c ML_BSSN_MP_RHSBoundary.c ML_BSSN_MP_enforce.c ML_BSSN_MP_boundary.c ML_BSSN_MP_convertToADMBase.c ML_BSSN_MP_ADMBaseBoundary.c ML_BSSN_MP_constraints.c ML_BSSN_MP_constraints_boundary.c Boundaries.c 
diff --git a/ML_BSSN_MP_Helper/interface.ccl b/ML_BSSN_MP_Helper/interface.ccl
index 6258207..d29d7a3 100644
--- a/ML_BSSN_MP_Helper/interface.ccl
+++ b/ML_BSSN_MP_Helper/interface.ccl
@@ -6,5 +6,32 @@ USES INCLUDE: Symmetry.h
 
 
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+CCTK_INT FUNCTION MoLRegisterConstrainedGroup \
+    (CCTK_INT IN ConstrainedIndex)
+USES FUNCTION MoLRegisterConstrainedGroup
+
+CCTK_INT FUNCTION                         \
+    Boundary_SelectGroupForBC             \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+          CCTK_INT IN faces,              \
+          CCTK_INT IN boundary_width,     \
+          CCTK_INT IN table_handle,       \
+          CCTK_STRING IN group_name,      \
+          CCTK_STRING IN bc_name)
 USES FUNCTION Boundary_SelectGroupForBC
+
+CCTK_INT FUNCTION                         \
+    ExtrapolateGammas                     \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY INOUT var)
+USES FUNCTION ExtrapolateGammas
+
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+USES FUNCTION NewRad_Apply
diff --git a/ML_BSSN_MP_Helper/param.ccl b/ML_BSSN_MP_Helper/param.ccl
index c3bdcc9..44b932d 100644
--- a/ML_BSSN_MP_Helper/param.ccl
+++ b/ML_BSSN_MP_Helper/param.ccl
@@ -1,3 +1,7 @@
+SHARES: Boundary
+
+USES CCTK_INT radpower
+
 SHARES: MethodofLines
 
 USES CCTK_INT MoL_Num_Constrained_Vars
@@ -15,6 +19,13 @@ SHARES: ML_BSSN_MP
 USES CCTK_INT timelevels
 USES KEYWORD calculate_ADMBase_variables_at
 
+USES CCTK_REAL harmonicF
+
+EXTENDS KEYWORD my_rhs_boundary_condition
+{
+  "NewRad" :: "NewRad"
+}
+
 PRIVATE:
 
 CCTK_INT ML_BSSN_MP_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
diff --git a/ML_BSSN_MP_Helper/schedule.ccl b/ML_BSSN_MP_Helper/schedule.ccl
index f950eaf..7826969 100644
--- a/ML_BSSN_MP_Helper/schedule.ccl
+++ b/ML_BSSN_MP_Helper/schedule.ccl
@@ -62,6 +62,33 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN_MP")) {
   
   
   
+  if (CCTK_EQUALS (my_rhs_boundary_condition, "NewRad"))
+  {
+    SCHEDULE ML_BSSN_MP_ExtrapolateGammas AT initial AFTER ML_BSSN_MP_convertFromADMBaseGamma
+    {
+      LANG: C
+      SYNC: ML_Gamma
+      SYNC: ML_dtlapse
+      SYNC: ML_dtshift
+    } "Extrapolate Gammas and time derivatives of lapse and shift"
+    
+    SCHEDULE ML_BSSN_MP_NewRad IN ML_BSSN_MP_evolCalcGroup AFTER ML_BSSN_MP_RHS
+    {
+      LANG: C
+      SYNC: ML_curvrhs
+      SYNC: ML_dtlapserhs
+      SYNC: ML_dtshiftrhs
+      SYNC: ML_Gammarhs
+      SYNC: ML_lapserhs
+      SYNC: ML_log_confacrhs
+      SYNC: ML_metricrhs
+      SYNC: ML_shiftrhs
+      SYNC: ML_trace_curvrhs
+    } "Apply NewRad boundary conditions to RHS"
+  }
+  
+  
+  
   SCHEDULE GROUP ML_BSSN_MP_convertToADMBaseGroup IN ML_BSSN_MP_convertToADMBaseGroupWrapper
   {
   } "Calculate ADM variables"
diff --git a/ML_BSSN_MP_Helper/src/ExtrapolateGammas.c b/ML_BSSN_MP_Helper/src/ExtrapolateGammas.c
new file mode 100644
index 0000000..9e3dcd4
--- /dev/null
+++ b/ML_BSSN_MP_Helper/src/ExtrapolateGammas.c
@@ -0,0 +1,29 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+
+static void
+extrap (cGH const * restrict cctkGH,
+        CCTK_REAL * restrict var);
+
+void
+ML_BSSN_MP_ExtrapolateGammas (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  
+  extrap (cctkGH, Xt1);
+  extrap (cctkGH, Xt2);
+  extrap (cctkGH, Xt3);
+  
+  extrap (cctkGH, A);
+  
+  extrap (cctkGH, B1);
+  extrap (cctkGH, B2);
+  extrap (cctkGH, B3);
+}
+
+static void
+extrap (cGH const * restrict const cctkGH,
+        CCTK_REAL * restrict const var)
+{
+  ExtrapolateGammas (cctkGH, var);
+}
diff --git a/ML_BSSN_MP_Helper/src/NewRad.c b/ML_BSSN_MP_Helper/src/NewRad.c
new file mode 100644
index 0000000..5a607d3
--- /dev/null
+++ b/ML_BSSN_MP_Helper/src/NewRad.c
@@ -0,0 +1,67 @@
+#include <math.h>
+
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
+
+static void
+newrad (cGH const * restrict cctkGH,
+        CCTK_REAL const * restrict var,
+        CCTK_REAL * restrict rhs,
+        CCTK_REAL var0,
+        CCTK_REAL v0);
+
+void
+ML_BSSN_MP_NewRad (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  CCTK_REAL const v0 = sqrt (harmonicF);
+  
+  newrad (cctkGH, phi  , phirhs  , 0.0, v0 );
+  
+  newrad (cctkGH, gt11 , gt11rhs , 1.0, 1.0);
+  newrad (cctkGH, gt12 , gt12rhs , 0.0, 1.0);
+  newrad (cctkGH, gt13 , gt13rhs , 0.0, 1.0);
+  newrad (cctkGH, gt22 , gt22rhs , 1.0, 1.0);
+  newrad (cctkGH, gt23 , gt23rhs , 0.0, 1.0);
+  newrad (cctkGH, gt33 , gt33rhs , 1.0, 1.0);
+  
+  newrad (cctkGH, Xt1  , Xt1rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt2  , Xt2rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt3  , Xt3rhs  , 0.0, 1.0);
+  
+  newrad (cctkGH, trK  , trKrhs  , 0.0, v0 );
+  
+  newrad (cctkGH, At11 , At11rhs , 0.0, 1.0);
+  newrad (cctkGH, At12 , At12rhs , 0.0, 1.0);
+  newrad (cctkGH, At13 , At13rhs , 0.0, 1.0);
+  newrad (cctkGH, At22 , At22rhs , 0.0, 1.0);
+  newrad (cctkGH, At23 , At23rhs , 0.0, 1.0);
+  newrad (cctkGH, At33 , At33rhs , 0.0, 1.0);
+  
+  newrad (cctkGH, alpha, alpharhs, 1.0, v0 );
+  
+  newrad (cctkGH, A    , Arhs    , 0.0, v0 );
+  
+  newrad (cctkGH, beta1, beta1rhs, 0.0, 1.0);
+  newrad (cctkGH, beta2, beta2rhs, 0.0, 1.0);
+  newrad (cctkGH, beta3, beta3rhs, 0.0, 1.0);
+  
+  newrad (cctkGH, B1   , B1rhs   , 0.0, 1.0);
+  newrad (cctkGH, B2   , B2rhs   , 0.0, 1.0);
+  newrad (cctkGH, B3   , B3rhs   , 0.0, 1.0);
+}
+
+static void
+newrad (cGH const * restrict const cctkGH,
+        CCTK_REAL const * restrict const var,
+        CCTK_REAL * restrict const rhs,
+        CCTK_REAL const var0,
+        CCTK_REAL const v0)
+{
+  DECLARE_CCTK_PARAMETERS;
+  
+  NewRad_Apply (cctkGH, var, rhs, var0, v0, radpower);
+}
diff --git a/ML_BSSN_MP_Helper/src/make.code.defn b/ML_BSSN_MP_Helper/src/make.code.defn
index dcfe66e..7cc4e72 100644
--- a/ML_BSSN_MP_Helper/src/make.code.defn
+++ b/ML_BSSN_MP_Helper/src/make.code.defn
@@ -1,3 +1,3 @@
 # -*-Makefile-*-
-SRCS = RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
+SRCS = ExtrapolateGammas.c NewRad.c RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
 #  CopyADMBase.c
diff --git a/ML_BSSN_M_Helper/interface.ccl b/ML_BSSN_M_Helper/interface.ccl
index 7723d63..f76bc54 100644
--- a/ML_BSSN_M_Helper/interface.ccl
+++ b/ML_BSSN_M_Helper/interface.ccl
@@ -6,5 +6,32 @@ USES INCLUDE: Symmetry.h
 
 
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+CCTK_INT FUNCTION MoLRegisterConstrainedGroup \
+    (CCTK_INT IN ConstrainedIndex)
+USES FUNCTION MoLRegisterConstrainedGroup
+
+CCTK_INT FUNCTION                         \
+    Boundary_SelectGroupForBC             \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+          CCTK_INT IN faces,              \
+          CCTK_INT IN boundary_width,     \
+          CCTK_INT IN table_handle,       \
+          CCTK_STRING IN group_name,      \
+          CCTK_STRING IN bc_name)
 USES FUNCTION Boundary_SelectGroupForBC
+
+CCTK_INT FUNCTION                         \
+    ExtrapolateGammas                     \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY INOUT var)
+USES FUNCTION ExtrapolateGammas
+
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+USES FUNCTION NewRad_Apply
diff --git a/ML_BSSN_M_Helper/param.ccl b/ML_BSSN_M_Helper/param.ccl
index cc450fe..2a7a444 100644
--- a/ML_BSSN_M_Helper/param.ccl
+++ b/ML_BSSN_M_Helper/param.ccl
@@ -1,3 +1,7 @@
+SHARES: Boundary
+
+USES CCTK_INT radpower
+
 SHARES: MethodofLines
 
 USES CCTK_INT MoL_Num_Constrained_Vars
@@ -15,6 +19,13 @@ SHARES: ML_BSSN_M
 USES CCTK_INT timelevels
 USES KEYWORD calculate_ADMBase_variables_at
 
+USES CCTK_REAL harmonicF
+
+EXTENDS KEYWORD my_rhs_boundary_condition
+{
+  "NewRad" :: "NewRad"
+}
+
 PRIVATE:
 
 CCTK_INT ML_BSSN_M_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
diff --git a/ML_BSSN_M_Helper/schedule.ccl b/ML_BSSN_M_Helper/schedule.ccl
index ae361c6..e577c18 100644
--- a/ML_BSSN_M_Helper/schedule.ccl
+++ b/ML_BSSN_M_Helper/schedule.ccl
@@ -62,6 +62,33 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN_M")) {
   
   
   
+  if (CCTK_EQUALS (my_rhs_boundary_condition, "NewRad"))
+  {
+    SCHEDULE ML_BSSN_M_ExtrapolateGammas AT initial AFTER ML_BSSN_M_convertFromADMBaseGamma
+    {
+      LANG: C
+      SYNC: ML_Gamma
+      SYNC: ML_dtlapse
+      SYNC: ML_dtshift
+    } "Extrapolate Gammas and time derivatives of lapse and shift"
+    
+    SCHEDULE ML_BSSN_M_NewRad IN ML_BSSN_M_evolCalcGroup AFTER ML_BSSN_M_RHS
+    {
+      LANG: C
+      SYNC: ML_curvrhs
+      SYNC: ML_dtlapserhs
+      SYNC: ML_dtshiftrhs
+      SYNC: ML_Gammarhs
+      SYNC: ML_lapserhs
+      SYNC: ML_log_confacrhs
+      SYNC: ML_metricrhs
+      SYNC: ML_shiftrhs
+      SYNC: ML_trace_curvrhs
+    } "Apply NewRad boundary conditions to RHS"
+  }
+  
+  
+  
   SCHEDULE GROUP ML_BSSN_M_convertToADMBaseGroup IN ML_BSSN_M_convertToADMBaseGroupWrapper
   {
   } "Calculate ADM variables"
diff --git a/ML_BSSN_M_Helper/src/ExtrapolateGammas.c b/ML_BSSN_M_Helper/src/ExtrapolateGammas.c
new file mode 100644
index 0000000..3d4e4cc
--- /dev/null
+++ b/ML_BSSN_M_Helper/src/ExtrapolateGammas.c
@@ -0,0 +1,29 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+
+static void
+extrap (cGH const * restrict cctkGH,
+        CCTK_REAL * restrict var);
+
+void
+ML_BSSN_M_ExtrapolateGammas (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  
+  extrap (cctkGH, Xt1);
+  extrap (cctkGH, Xt2);
+  extrap (cctkGH, Xt3);
+  
+  extrap (cctkGH, A);
+  
+  extrap (cctkGH, B1);
+  extrap (cctkGH, B2);
+  extrap (cctkGH, B3);
+}
+
+static void
+extrap (cGH const * restrict const cctkGH,
+        CCTK_REAL * restrict const var)
+{
+  ExtrapolateGammas (cctkGH, var);
+}
diff --git a/ML_BSSN_M_Helper/src/NewRad.c b/ML_BSSN_M_Helper/src/NewRad.c
new file mode 100644
index 0000000..d7d2ba3
--- /dev/null
+++ b/ML_BSSN_M_Helper/src/NewRad.c
@@ -0,0 +1,67 @@
+#include <math.h>
+
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
+
+static void
+newrad (cGH const * restrict cctkGH,
+        CCTK_REAL const * restrict var,
+        CCTK_REAL * restrict rhs,
+        CCTK_REAL var0,
+        CCTK_REAL v0);
+
+void
+ML_BSSN_M_NewRad (CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  CCTK_REAL const v0 = sqrt (harmonicF);
+  
+  newrad (cctkGH, phi  , phirhs  , 0.0, v0 );
+  
+  newrad (cctkGH, gt11 , gt11rhs , 1.0, 1.0);
+  newrad (cctkGH, gt12 , gt12rhs , 0.0, 1.0);
+  newrad (cctkGH, gt13 , gt13rhs , 0.0, 1.0);
+  newrad (cctkGH, gt22 , gt22rhs , 1.0, 1.0);
+  newrad (cctkGH, gt23 , gt23rhs , 0.0, 1.0);
+  newrad (cctkGH, gt33 , gt33rhs , 1.0, 1.0);
+  
+  newrad (cctkGH, Xt1  , Xt1rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt2  , Xt2rhs  , 0.0, 1.0);
+  newrad (cctkGH, Xt3  , Xt3rhs  , 0.0, 1.0);
+  
+  newrad (cctkGH, trK  , trKrhs  , 0.0, v0 );
+  
+  newrad (cctkGH, At11 , At11rhs , 0.0, 1.0);
+  newrad (cctkGH, At12 , At12rhs , 0.0, 1.0);
+  newrad (cctkGH, At13 , At13rhs , 0.0, 1.0);
+  newrad (cctkGH, At22 , At22rhs , 0.0, 1.0);
+  newrad (cctkGH, At23 , At23rhs , 0.0, 1.0);
+  newrad (cctkGH, At33 , At33rhs , 0.0, 1.0);
+  
+  newrad (cctkGH, alpha, alpharhs, 1.0, v0 );
+  
+  newrad (cctkGH, A    , Arhs    , 0.0, v0 );
+  
+  newrad (cctkGH, beta1, beta1rhs, 0.0, 1.0);
+  newrad (cctkGH, beta2, beta2rhs, 0.0, 1.0);
+  newrad (cctkGH, beta3, beta3rhs, 0.0, 1.0);
+  
+  newrad (cctkGH, B1   , B1rhs   , 0.0, 1.0);
+  newrad (cctkGH, B2   , B2rhs   , 0.0, 1.0);
+  newrad (cctkGH, B3   , B3rhs   , 0.0, 1.0);
+}
+
+static void
+newrad (cGH const * restrict const cctkGH,
+        CCTK_REAL const * restrict const var,
+        CCTK_REAL * restrict const rhs,
+        CCTK_REAL const var0,
+        CCTK_REAL const v0)
+{
+  DECLARE_CCTK_PARAMETERS;
+  
+  NewRad_Apply (cctkGH, var, rhs, var0, v0, radpower);
+}
diff --git a/ML_BSSN_M_Helper/src/make.code.defn b/ML_BSSN_M_Helper/src/make.code.defn
index dcfe66e..7cc4e72 100644
--- a/ML_BSSN_M_Helper/src/make.code.defn
+++ b/ML_BSSN_M_Helper/src/make.code.defn
@@ -1,3 +1,3 @@
 # -*-Makefile-*-
-SRCS = RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
+SRCS = ExtrapolateGammas.c NewRad.c RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
 #  CopyADMBase.c
diff --git a/ML_FOWavetoy/configuration.ccl b/ML_FOWavetoy/configuration.ccl
index 290ba20..5fb01c5 100644
--- a/ML_FOWavetoy/configuration.ccl
+++ b/ML_FOWavetoy/configuration.ccl
@@ -1,5 +1,5 @@
 # File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
+# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
diff --git a/ML_FOWavetoy/interface.ccl b/ML_FOWavetoy/interface.ccl
index 170dfba..f1416ea 100644
--- a/ML_FOWavetoy/interface.ccl
+++ b/ML_FOWavetoy/interface.ccl
@@ -1,11 +1,11 @@
 # File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
+# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
 implements: ML_FOWaveToy
 
-inherits:   MultiPatch Grid GenericFD Boundary
+inherits:   Grid GenericFD Boundary
 
 
 
diff --git a/ML_FOWavetoy/param.ccl b/ML_FOWavetoy/param.ccl
index 0aaa794..e100947 100644
--- a/ML_FOWavetoy/param.ccl
+++ b/ML_FOWavetoy/param.ccl
@@ -1,5 +1,5 @@
 # File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
+# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
diff --git a/ML_FOWavetoy/schedule.ccl b/ML_FOWavetoy/schedule.ccl
index 4fa2d19..c6a7602 100644
--- a/ML_FOWavetoy/schedule.ccl
+++ b/ML_FOWavetoy/schedule.ccl
@@ -1,5 +1,5 @@
 # File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
+# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
diff --git a/ML_FOWavetoy/src/Boundaries.c b/ML_FOWavetoy/src/Boundaries.c
index eb0aab1..f8a0ced 100644
--- a/ML_FOWavetoy/src/Boundaries.c
+++ b/ML_FOWavetoy/src/Boundaries.c
@@ -1,5 +1,5 @@
 /*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
+/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
diff --git a/ML_FOWavetoy/src/RegisterMoL.c b/ML_FOWavetoy/src/RegisterMoL.c
index 77c7c77..5bc5a0f 100644
--- a/ML_FOWavetoy/src/RegisterMoL.c
+++ b/ML_FOWavetoy/src/RegisterMoL.c
@@ -1,5 +1,5 @@
 /*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
+/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
diff --git a/ML_FOWavetoy/src/RegisterSymmetries.c b/ML_FOWavetoy/src/RegisterSymmetries.c
index 60d7faf..c1fd441 100644
--- a/ML_FOWavetoy/src/RegisterSymmetries.c
+++ b/ML_FOWavetoy/src/RegisterSymmetries.c
@@ -1,5 +1,5 @@
 /*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
+/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
diff --git a/ML_FOWavetoy/src/Startup.c b/ML_FOWavetoy/src/Startup.c
index 814a70c..fd4a412 100644
--- a/ML_FOWavetoy/src/Startup.c
+++ b/ML_FOWavetoy/src/Startup.c
@@ -1,5 +1,5 @@
 /*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
+/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
diff --git a/ML_FOWavetoy/src/WTFO_Gaussian.c b/ML_FOWavetoy/src/WTFO_Gaussian.c
index 2df9ab4..26ea841 100644
--- a/ML_FOWavetoy/src/WTFO_Gaussian.c
+++ b/ML_FOWavetoy/src/WTFO_Gaussian.c
@@ -1,5 +1,5 @@
 /*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
+/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -40,19 +40,9 @@ void WTFO_Gaussian_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT c
   CCTK_REAL p1o12dx = INITVALUE;
   CCTK_REAL p1o12dy = INITVALUE;
   CCTK_REAL p1o12dz = INITVALUE;
-  CCTK_REAL p1o144dx2dy = INITVALUE;
-  CCTK_REAL p1o144dx2dz = INITVALUE;
   CCTK_REAL p1o144dxdy = INITVALUE;
-  CCTK_REAL p1o144dxdy2 = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
-  CCTK_REAL p1o144dxdz2 = INITVALUE;
-  CCTK_REAL p1o144dy2dz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o144dydz2 = INITVALUE;
-  CCTK_REAL p1o1728dxdydz = INITVALUE;
-  CCTK_REAL p1o2dx3 = INITVALUE;
-  CCTK_REAL p1o2dy3 = INITVALUE;
-  CCTK_REAL p1o2dz3 = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
@@ -89,19 +79,9 @@ void WTFO_Gaussian_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT c
   p1o12dx = INV(dx)/12.;
   p1o12dy = INV(dy)/12.;
   p1o12dz = INV(dz)/12.;
-  p1o144dx2dy = (INV(dy)*pow(dx,-2))/144.;
-  p1o144dx2dz = (INV(dz)*pow(dx,-2))/144.;
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
-  p1o144dxdy2 = (INV(dx)*pow(dy,-2))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
-  p1o144dxdz2 = (INV(dx)*pow(dz,-2))/144.;
-  p1o144dy2dz = (INV(dz)*pow(dy,-2))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o144dydz2 = (INV(dy)*pow(dz,-2))/144.;
-  p1o1728dxdydz = (INV(dx)*INV(dy)*INV(dz))/1728.;
-  p1o2dx3 = khalf*pow(dx,-3);
-  p1o2dy3 = khalf*pow(dy,-3);
-  p1o2dz3 = khalf*pow(dz,-3);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
diff --git a/ML_FOWavetoy/src/WTFO_RHS.c b/ML_FOWavetoy/src/WTFO_RHS.c
index ad128e0..77b5876 100644
--- a/ML_FOWavetoy/src/WTFO_RHS.c
+++ b/ML_FOWavetoy/src/WTFO_RHS.c
@@ -1,5 +1,5 @@
 /*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
+/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -40,19 +40,9 @@ void WTFO_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const
   CCTK_REAL p1o12dx = INITVALUE;
   CCTK_REAL p1o12dy = INITVALUE;
   CCTK_REAL p1o12dz = INITVALUE;
-  CCTK_REAL p1o144dx2dy = INITVALUE;
-  CCTK_REAL p1o144dx2dz = INITVALUE;
   CCTK_REAL p1o144dxdy = INITVALUE;
-  CCTK_REAL p1o144dxdy2 = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
-  CCTK_REAL p1o144dxdz2 = INITVALUE;
-  CCTK_REAL p1o144dy2dz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o144dydz2 = INITVALUE;
-  CCTK_REAL p1o1728dxdydz = INITVALUE;
-  CCTK_REAL p1o2dx3 = INITVALUE;
-  CCTK_REAL p1o2dy3 = INITVALUE;
-  CCTK_REAL p1o2dz3 = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
@@ -89,19 +79,9 @@ void WTFO_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const
   p1o12dx = INV(dx)/12.;
   p1o12dy = INV(dy)/12.;
   p1o12dz = INV(dz)/12.;
-  p1o144dx2dy = (INV(dy)*pow(dx,-2))/144.;
-  p1o144dx2dz = (INV(dz)*pow(dx,-2))/144.;
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
-  p1o144dxdy2 = (INV(dx)*pow(dy,-2))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
-  p1o144dxdz2 = (INV(dx)*pow(dz,-2))/144.;
-  p1o144dy2dz = (INV(dz)*pow(dy,-2))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o144dydz2 = (INV(dy)*pow(dz,-2))/144.;
-  p1o1728dxdydz = (INV(dx)*INV(dy)*INV(dz))/1728.;
-  p1o2dx3 = khalf*pow(dx,-3);
-  p1o2dy3 = khalf*pow(dy,-3);
-  p1o2dz3 = khalf*pow(dz,-3);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
diff --git a/ML_FOWavetoy/src/WTFO_constraints.c b/ML_FOWavetoy/src/WTFO_constraints.c
index 70f2fb8..833a8bb 100644
--- a/ML_FOWavetoy/src/WTFO_constraints.c
+++ b/ML_FOWavetoy/src/WTFO_constraints.c
@@ -1,5 +1,5 @@
 /*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
+/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -40,19 +40,9 @@ void WTFO_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
   CCTK_REAL p1o12dx = INITVALUE;
   CCTK_REAL p1o12dy = INITVALUE;
   CCTK_REAL p1o12dz = INITVALUE;
-  CCTK_REAL p1o144dx2dy = INITVALUE;
-  CCTK_REAL p1o144dx2dz = INITVALUE;
   CCTK_REAL p1o144dxdy = INITVALUE;
-  CCTK_REAL p1o144dxdy2 = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
-  CCTK_REAL p1o144dxdz2 = INITVALUE;
-  CCTK_REAL p1o144dy2dz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o144dydz2 = INITVALUE;
-  CCTK_REAL p1o1728dxdydz = INITVALUE;
-  CCTK_REAL p1o2dx3 = INITVALUE;
-  CCTK_REAL p1o2dy3 = INITVALUE;
-  CCTK_REAL p1o2dz3 = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
@@ -89,19 +79,9 @@ void WTFO_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
   p1o12dx = INV(dx)/12.;
   p1o12dy = INV(dy)/12.;
   p1o12dz = INV(dz)/12.;
-  p1o144dx2dy = (INV(dy)*pow(dx,-2))/144.;
-  p1o144dx2dz = (INV(dz)*pow(dx,-2))/144.;
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
-  p1o144dxdy2 = (INV(dx)*pow(dy,-2))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
-  p1o144dxdz2 = (INV(dx)*pow(dz,-2))/144.;
-  p1o144dy2dz = (INV(dz)*pow(dy,-2))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o144dydz2 = (INV(dy)*pow(dz,-2))/144.;
-  p1o1728dxdydz = (INV(dx)*INV(dy)*INV(dz))/1728.;
-  p1o2dx3 = khalf*pow(dx,-3);
-  p1o2dy3 = khalf*pow(dy,-3);
-  p1o2dz3 = khalf*pow(dz,-3);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
diff --git a/ML_FOWavetoy/src/make.code.defn b/ML_FOWavetoy/src/make.code.defn
index 97ab1f1..2be338d 100644
--- a/ML_FOWavetoy/src/make.code.defn
+++ b/ML_FOWavetoy/src/make.code.defn
@@ -1,5 +1,5 @@
 # File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
+# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
diff --git a/ML_WaveToy/configuration.ccl b/ML_WaveToy/configuration.ccl
index 5fb01c5..148a1a1 100644
--- a/ML_WaveToy/configuration.ccl
+++ b/ML_WaveToy/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_WaveToy/interface.ccl b/ML_WaveToy/interface.ccl
index 2da5f6c..0eaf036 100644
--- a/ML_WaveToy/interface.ccl
+++ b/ML_WaveToy/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_WaveToy
 
@@ -28,18 +25,6 @@ CCTK_INT FUNCTION Boundary_SelectVarForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT
 USES FUNCTION Boundary_SelectVarForBC
 
 public:
-CCTK_REAL WT_rhorhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  rhorhs
-} "WT_rhorhs"
-
-public:
-CCTK_REAL WT_urhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  urhs
-} "WT_urhs"
-
-public:
 CCTK_REAL WT_rho type=GF timelevels=2 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   rho
@@ -50,3 +35,15 @@ CCTK_REAL WT_u type=GF timelevels=2 tags='tensortypealias="Scalar" tensorweight=
 {
   u
 } "WT_u"
+
+public:
+CCTK_REAL WT_rhorhs type=GF timelevels=2 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  rhorhs
+} "WT_rhorhs"
+
+public:
+CCTK_REAL WT_urhs type=GF timelevels=2 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  urhs
+} "WT_urhs"
diff --git a/ML_WaveToy/param.ccl b/ML_WaveToy/param.ccl
index ac4441a..0ec7fbc 100644
--- a/ML_WaveToy/param.ccl
+++ b/ML_WaveToy/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: GenericFD
@@ -36,6 +33,12 @@ CCTK_INT timelevels "Number of active timelevels"
 } 2
 
 restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:2 :: ""
+} 1
+
+restricted:
 CCTK_INT WT_Gaussian_calc_every "WT_Gaussian_calc_every"
 {
   *:* :: ""
diff --git a/ML_WaveToy/schedule.ccl b/ML_WaveToy/schedule.ccl
index 81bdce8..955217d 100644
--- a/ML_WaveToy/schedule.ccl
+++ b/ML_WaveToy/schedule.ccl
@@ -1,12 +1,5 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# File produced by Kranc
 
-# Mathematica script written by Ian Hinder and Sascha Husa
-
-
-STORAGE: WT_rhorhs[1]
-
-STORAGE: WT_urhs[1]
 
 if (timelevels == 1)
 {
@@ -26,6 +19,24 @@ if (timelevels == 2)
   STORAGE: WT_u[2]
 }
 
+if (rhs_timelevels == 1)
+{
+  STORAGE: WT_rhorhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: WT_rhorhs[2]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: WT_urhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: WT_urhs[2]
+}
+
 schedule ML_WaveToy_Startup at STARTUP
 {
   LANG: C
diff --git a/ML_WaveToy/src/Boundaries.c b/ML_WaveToy/src/Boundaries.c
index 63173bc..086626f 100644
--- a/ML_WaveToy/src/Boundaries.c
+++ b/ML_WaveToy/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_WaveToy/src/RegisterMoL.c b/ML_WaveToy/src/RegisterMoL.c
index 2ce856c..7c0f0eb 100644
--- a/ML_WaveToy/src/RegisterMoL.c
+++ b/ML_WaveToy/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_WaveToy/src/RegisterSymmetries.c b/ML_WaveToy/src/RegisterSymmetries.c
index e3bf88a..67e799a 100644
--- a/ML_WaveToy/src/RegisterSymmetries.c
+++ b/ML_WaveToy/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_WaveToy/src/Startup.c b/ML_WaveToy/src/Startup.c
index ce5162f..c80c9fb 100644
--- a/ML_WaveToy/src/Startup.c
+++ b/ML_WaveToy/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_WaveToy/src/WT_Gaussian.c b/ML_WaveToy/src/WT_Gaussian.c
index b6dbd79..fe06432 100644
--- a/ML_WaveToy/src/WT_Gaussian.c
+++ b/ML_WaveToy/src/WT_Gaussian.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_WaveToy/src/WT_RHS.c b/ML_WaveToy/src/WT_RHS.c
index 1cb84f7..7317ac9 100644
--- a/ML_WaveToy/src/WT_RHS.c
+++ b/ML_WaveToy/src/WT_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_WaveToy/src/make.code.defn b/ML_WaveToy/src/make.code.defn
index d6bd576..9a7a3e2 100644
--- a/ML_WaveToy/src/make.code.defn
+++ b/ML_WaveToy/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c WT_Gaussian.c WT_RHS.c Boundaries.c 
diff --git a/ML_hydro/configuration.ccl b/ML_hydro/configuration.ccl
index 290ba20..148a1a1 100644
--- a/ML_hydro/configuration.ccl
+++ b/ML_hydro/configuration.ccl
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 REQUIRES LoopControl
diff --git a/ML_hydro/interface.ccl b/ML_hydro/interface.ccl
index a0ca7d6..7af3ebf 100644
--- a/ML_hydro/interface.ccl
+++ b/ML_hydro/interface.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 implements: ML_hydro
 
@@ -90,26 +87,6 @@ CCTK_REAL vol_group type=GF timelevels=1 tags='tensortypealias="Scalar" tensorwe
 } "vol_group"
 
 public:
-CCTK_REAL ene_grouprhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  enerhs
-} "ene_grouprhs"
-
-public:
-CCTK_REAL mass_grouprhs type=GF timelevels=1 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
-{
-  massrhs
-} "mass_grouprhs"
-
-public:
-CCTK_REAL mom_grouprhs type=GF timelevels=1 tags='tensortypealias="D" tensorweight=1.0000000000000000000'
-{
-  mom1rhs,
-  mom2rhs,
-  mom3rhs
-} "mom_grouprhs"
-
-public:
 CCTK_REAL ene_group type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
 {
   ene
@@ -128,3 +105,23 @@ CCTK_REAL mom_group type=GF timelevels=3 tags='tensortypealias="D" tensorweight=
   mom2,
   mom3
 } "mom_group"
+
+public:
+CCTK_REAL ene_grouprhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  enerhs
+} "ene_grouprhs"
+
+public:
+CCTK_REAL mass_grouprhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1.0000000000000000000'
+{
+  massrhs
+} "mass_grouprhs"
+
+public:
+CCTK_REAL mom_grouprhs type=GF timelevels=3 tags='tensortypealias="D" tensorweight=1.0000000000000000000'
+{
+  mom1rhs,
+  mom2rhs,
+  mom3rhs
+} "mom_grouprhs"
diff --git a/ML_hydro/param.ccl b/ML_hydro/param.ccl
index 6d0ec4d..90cf838 100644
--- a/ML_hydro/param.ccl
+++ b/ML_hydro/param.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 shares: GenericFD
@@ -73,6 +70,12 @@ CCTK_INT timelevels "Number of active timelevels"
 } 3
 
 restricted:
+CCTK_INT rhs_timelevels "Number of active RHS timelevels"
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_INT hydro_vacuum_calc_every "hydro_vacuum_calc_every"
 {
   *:* :: ""
diff --git a/ML_hydro/schedule.ccl b/ML_hydro/schedule.ccl
index 8cfedc6..b145236 100644
--- a/ML_hydro/schedule.ccl
+++ b/ML_hydro/schedule.ccl
@@ -1,7 +1,4 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 
 STORAGE: eneflux_group[1]
@@ -20,12 +17,6 @@ STORAGE: vel_group[1]
 
 STORAGE: vol_group[1]
 
-STORAGE: ene_grouprhs[1]
-
-STORAGE: mass_grouprhs[1]
-
-STORAGE: mom_grouprhs[1]
-
 if (timelevels == 1)
 {
   STORAGE: ene_group[1]
@@ -65,6 +56,45 @@ if (timelevels == 3)
   STORAGE: mom_group[3]
 }
 
+if (rhs_timelevels == 1)
+{
+  STORAGE: ene_grouprhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: ene_grouprhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: ene_grouprhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: mass_grouprhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: mass_grouprhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: mass_grouprhs[3]
+}
+
+if (rhs_timelevels == 1)
+{
+  STORAGE: mom_grouprhs[1]
+}
+if (rhs_timelevels == 2)
+{
+  STORAGE: mom_grouprhs[2]
+}
+if (rhs_timelevels == 3)
+{
+  STORAGE: mom_grouprhs[3]
+}
+
 schedule ML_hydro_Startup at STARTUP
 {
   LANG: C
diff --git a/ML_hydro/src/Boundaries.c b/ML_hydro/src/Boundaries.c
index de8db23..a274284 100644
--- a/ML_hydro/src/Boundaries.c
+++ b/ML_hydro/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_hydro/src/RegisterMoL.c b/ML_hydro/src/RegisterMoL.c
index 99f3312..9ba7a20 100644
--- a/ML_hydro/src/RegisterMoL.c
+++ b/ML_hydro/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_hydro/src/RegisterSymmetries.c b/ML_hydro/src/RegisterSymmetries.c
index 2917b7b..dde9438 100644
--- a/ML_hydro/src/RegisterSymmetries.c
+++ b/ML_hydro/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_hydro/src/Startup.c b/ML_hydro/src/Startup.c
index 95ce900..e7ec023 100644
--- a/ML_hydro/src/Startup.c
+++ b/ML_hydro/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_hydro/src/hydro_RHS.c b/ML_hydro/src/hydro_RHS.c
index e0b4324..8629ae3 100644
--- a/ML_hydro/src/hydro_RHS.c
+++ b/ML_hydro/src/hydro_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_hydro/src/hydro_con2prim.c b/ML_hydro/src/hydro_con2prim.c
index ef96f15..2c6fbe0 100644
--- a/ML_hydro/src/hydro_con2prim.c
+++ b/ML_hydro/src/hydro_con2prim.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_hydro/src/hydro_prim2con.c b/ML_hydro/src/hydro_prim2con.c
index 7171e5d..fabb629 100644
--- a/ML_hydro/src/hydro_prim2con.c
+++ b/ML_hydro/src/hydro_prim2con.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_hydro/src/hydro_soundWave.c b/ML_hydro/src/hydro_soundWave.c
index bb16ddd..dd2544a 100644
--- a/ML_hydro/src/hydro_soundWave.c
+++ b/ML_hydro/src/hydro_soundWave.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_hydro/src/hydro_vacuum.c b/ML_hydro/src/hydro_vacuum.c
index 5f2759b..dd69367 100644
--- a/ML_hydro/src/hydro_vacuum.c
+++ b/ML_hydro/src/hydro_vacuum.c
@@ -1,7 +1,4 @@
-/*  File produced by user eschnett */
-/*  Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_hydro/src/make.code.defn b/ML_hydro/src/make.code.defn
index 170771a..71abf2b 100644
--- a/ML_hydro/src/make.code.defn
+++ b/ML_hydro/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user eschnett
-# Produced with Mathematica Version 7.0 for Mac OS X x86 (64-bit) (February 19, 2009)
-
-# Mathematica script written by Ian Hinder and Sascha Husa
+# File produced by Kranc
 
 SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c hydro_vacuum.c hydro_soundWave.c hydro_prim2con.c hydro_con2prim.c hydro_RHS.c Boundaries.c 
diff --git a/README b/README
index 8e775c9..5e5a0fd 100644
--- a/README
+++ b/README
@@ -4,8 +4,7 @@ Copyright (C) 2007 Erik Schnetter <schnetter@cct.lsu.edu>
 
 
 
-A suite of spacetime codes.  The name "McLachlan" is in honour of
-Sarah McLachlan, the Canadian singer.
+A suite of spacetime codes.
 
 The code is generated with Kranc
 <http://numrel.aei.mpg.de/Research/Kranc/>
diff --git a/m/Makefile b/m/Makefile
index f68b0f4..cc3bca0 100644
--- a/m/Makefile
+++ b/m/Makefile
@@ -1,6 +1,6 @@
 # -*-Makefile-*-
 
-all: McLachlan_ADM.out McLachlan_BSSN.out McLachlanW.out McLachlanUp.out McLachlan6.out WaveToy.out hydro.out
+all: McLachlan_ADM.out McLachlan_BSSN.out McLachlanW.out McLachlanUp.out McLachlan6.out WaveToy.out WaveToyFO.out hydro.out
 	@echo
 	@echo "The Cactus thorns are up to date."
 	@echo
@@ -49,9 +49,16 @@ McLachlan6.out: McLachlan6.m
 	done
 
 WaveToy.out: WaveToy.m
-	rm -rf ML_WaveToy ML_FOWaveToy
+	rm -rf ML_WaveToy
+	./runmath.sh $^
+	for thorn in ML_WaveToy; do \
+		./copy-if-changed.sh $$thorn ../$$thorn; \
+	done
+
+WaveToyFO.out: WaveToyFO.m
+	rm -rf ML_FOWaveToy
 	./runmath.sh $^
-	for thorn in ML_WaveToy ML_FOWaveToy; do \
+	for thorn in ML_FOWaveToy; do \
 		./copy-if-changed.sh $$thorn ../$$thorn; \
 	done
 
diff --git a/m/McLachlan_BSSN.m b/m/McLachlan_BSSN.m
index 4b505e5..03ab5c7 100644
--- a/m/McLachlan_BSSN.m
+++ b/m/McLachlan_BSSN.m
@@ -17,7 +17,7 @@ prefix = "ML_";
 suffix =
   If [useGlobalDerivs, "_MP", ""] <>
   If [derivOrder!=4, "_O" <> ToString[derivOrder], ""] <>
-  If [evolutionTimelevels!=3, "_TL" <> ToString[evolutionTimelevels], ""] <>
+  (* If [evolutionTimelevels!=3, "_TL" <> ToString[evolutionTimelevels], ""] <> *)
   If [addMatter==1, "_M", ""];
 
 BSSN = prefix <> "BSSN" <> suffix;
@@ -890,7 +890,7 @@ keywordParameters =
   },
   {
     Name -> "my_rhs_boundary_condition",
-    (* Visibility -> "restricted", *)
+    Visibility -> "restricted",
     (* Description -> "ddd", *)
     AllowedValues -> {"none", "radiative"},
     Default -> "none"
@@ -1008,6 +1008,6 @@ CreateKrancThornTT [groups, ".", BSSN,
 (* matter: 0 or 1
    (matter seems cheap; it should be always enabled) *)
 
-createCode[4, False, 3, 0];
-createCode[4, False, 3, 1];
-createCode[4, True,  3, 0];
+createCode[4, False, 4, 0];
+createCode[4, False, 4, 1];
+createCode[4, True,  4, 0];
diff --git a/m/WaveToy.m b/m/WaveToy.m
index 88e91c4..61847d3 100644
--- a/m/WaveToy.m
+++ b/m/WaveToy.m
@@ -17,7 +17,8 @@ derivatives =
   PDstandardNth[i_]     -> StandardCenteredDifferenceOperator[1,derivOrder/2,i],
   PDstandardNth[i_, i_] -> StandardCenteredDifferenceOperator[2,derivOrder/2,i],
   PDstandardNth[i_, j_] -> StandardCenteredDifferenceOperator[1,derivOrder/2,i]
-                           StandardCenteredDifferenceOperator[1,derivOrder/2,j],
+                           StandardCenteredDifferenceOperator[1,derivOrder/2,j]
+(*
   PDstandardNth[i_, i_, i_] ->
     StandardCenteredDifferenceOperator[3,derivOrder/2,i],
   PDstandardNth[i_, i_, j_] ->
@@ -33,18 +34,12 @@ derivatives =
     StandardCenteredDifferenceOperator[1,derivOrder/2,i]
     StandardCenteredDifferenceOperator[1,derivOrder/2,j]
     StandardCenteredDifferenceOperator[1,derivOrder/2,k]
+*)
 };
 
-(* local derivatives *)
-PDloc = PDstandardNth;
-
-(* global derivatives *)
-PDglob[var_,lx_] := Jinv[u1,lx] PDloc[var,l1];
-PDglob[var_,lx_,ly_] :=
-  dJinv[u1,lx,ly] PDloc[var,l1] + Jinv[u1,lx] Jinv[u2,ly] PDloc[var,l1,l2];
-
-UseGlobalDerivs = False;
-PD := If [UseGlobalDerivs, PDglob, PDloc];
+FD = PDstandardNth;
+ResetJacobians;
+DefineJacobian[PD, FD, KD, Zero3];
 
 (* timelevels *)
 evolutionTimelevels = 2;
@@ -56,10 +51,7 @@ KD = KroneckerDelta;
 (******************************************************************************)
 
 (* Register the tensor quantities with the TensorTools package *)
-Map [DefineTensor, {u, rho, v, w, J, Jinv, dJ, dJinv}];
-
-AssertSymmetricIncreasing [dJ[uA,lb,lc], lb,lc];
-AssertSymmetricIncreasing [dJinv[ua,lx,ly], lx,ly];
+Map [DefineTensor, {u, rho, v, w}];
 
 (******************************************************************************)
 (* Groups *)
@@ -73,36 +65,7 @@ evaluatedGroups = {};
 declaredGroups = Join [evolvedGroups, evaluatedGroups];
 declaredGroupNames = Map [First, declaredGroups];
 
-evolvedGroupsFO =
-  {SetGroupName [CreateGroupFromTensor [u    ], "WT_u"  ],
-   SetGroupName [CreateGroupFromTensor [v[la]], "WT_v"  ],
-   SetGroupName [CreateGroupFromTensor [rho  ], "WT_rho"]};
-evaluatedGroupsFO =
-  {SetGroupName [CreateGroupFromTensor [w[ua]], "WT_w"]};
-
-declaredGroupsFO = Join [evolvedGroupsFO, evaluatedGroupsFO];
-declaredGroupNamesFO = Map [First, declaredGroupsFO];
-
-
-
-extraGroups =
-  {{"MultiPatch::transformation",
-    {dxda,dxdb,dxdc, dyda,dydb,dydc, dzda,dzdb,dzdc}},
-   {"MultiPatch::transformation_inv",
-    {dadx,dady,dadz, dbdx,dbdy,dbdz, dcdx,dcdy,dcdz}},
-   {"MultiPatch::transformation_derivs",
-    {ddxdada,ddxdadb,ddxdadc,ddxdbdb,ddxdbdc,ddxdcdc,
-     ddydada,ddydadb,ddydadc,ddydbdb,ddydbdc,ddydcdc,
-     ddzdada,ddzdadb,ddzdadc,ddzdbdb,ddzdbdc,ddzdcdc}},
-   {"MultiPatch::transformation_inv_derivs",
-    {ddadxdx,ddadxdy,ddadxdz,ddadydy,ddadzdz,ddadydz,
-     ddbdxdx,ddbdxdy,ddbdxdz,ddbdydy,ddbdzdz,ddbdydz,
-     ddcdxdx,ddcdxdy,ddcdxdz,ddcdydy,ddcdzdz,ddcdydz}}};
-
-
-
-groups = Join [declaredGroups, extraGroups];
-groupsFO = Join [declaredGroupsFO, extraGroups];
+groups = declaredGroups;
 
 (******************************************************************************)
 (* Initial data *)
@@ -121,20 +84,6 @@ initialCalc =
   }
 };
 
-initialCalcFO =
-{
-  Name -> "WTFO_Gaussian",
-  Schedule -> {"AT initial"},
-  (* Where -> Boundary, *)
-  (* Where -> Interior, *)
-  Equations -> 
-  {
-    u -> 0,
-    v[la] -> 0,
-    rho -> 0
-  }
-};
-
 (******************************************************************************)
 (* Evolution equations *)
 (******************************************************************************)
@@ -144,95 +93,13 @@ evolCalc =
   Name -> "WT_RHS",
   Schedule -> {"IN MoL_CalcRHS", "AT analysis"},
   Where -> Interior,
-  Shorthands -> {Jinv[ua,lx], dJinv[ua,lx,ly]},
   Equations -> 
   {
-    Jinv11 -> dadx,
-    Jinv12 -> dady,
-    Jinv13 -> dadz,
-    Jinv21 -> dbdx,
-    Jinv22 -> dbdy,
-    Jinv23 -> dbdz,
-    Jinv31 -> dcdx,
-    Jinv32 -> dcdy,
-    Jinv33 -> dcdz,
-    dJinv111 -> ddadxdx,
-    dJinv112 -> ddadxdy,
-    dJinv113 -> ddadxdz,
-    dJinv122 -> ddadydy,
-    dJinv123 -> ddadydz,
-    dJinv133 -> ddadzdz,
-    dJinv211 -> ddadxdx,
-    dJinv212 -> ddadxdy,
-    dJinv213 -> ddadxdz,
-    dJinv222 -> ddadydy,
-    dJinv223 -> ddadydz,
-    dJinv233 -> ddadzdz,
-    dJinv311 -> ddadxdx,
-    dJinv312 -> ddadxdy,
-    dJinv313 -> ddadxdz,
-    dJinv322 -> ddadydy,
-    dJinv323 -> ddadydz,
-    dJinv333 -> ddadzdz,
     dot[u] -> rho,
     dot[rho] -> KD[ua,ub] PD[u,la,lb]
   }
 };
 
-evolCalcFO =
-{
-  Name -> "WTFO_RHS",
-  Schedule -> {"IN MoL_CalcRHS", "AT analysis"},
-  Where -> Interior,
-  Shorthands -> {Jinv[ua,lx]},
-  Equations -> 
-  {
-    Jinv11 -> dadx,
-    Jinv12 -> dady,
-    Jinv13 -> dadz,
-    Jinv21 -> dbdx,
-    Jinv22 -> dbdy,
-    Jinv23 -> dbdz,
-    Jinv31 -> dcdx,
-    Jinv32 -> dcdy,
-    Jinv33 -> dcdz,
-    dot[u] -> rho,
-    dot[rho] -> KD[ua,ub] PD[v[la],lb],
-    dot[v[la]] -> PD[rho,la]
-  }
-};
-
-(******************************************************************************)
-(* Constraint equations *)
-(******************************************************************************)
-
-constraintsCalcFO =
-{
-  Name -> "WTFO_constraints",
-  Schedule -> {"AT analysis"},
-  Where -> Interior,
-  Shorthands -> {Jinv[ua,lx]},
-  Equations -> 
-  {
-    Jinv11 -> dadx,
-    Jinv12 -> dady,
-    Jinv13 -> dadz,
-    Jinv21 -> dbdx,
-    Jinv22 -> dbdy,
-    Jinv23 -> dbdz,
-    Jinv31 -> dcdx,
-    Jinv32 -> dcdy,
-    Jinv33 -> dcdz,
-    w[ua] -> Eps[ua,ub,uc] PD[v[lb],lc]
-  }
-};
-
-(******************************************************************************)
-(* Implementations *)
-(******************************************************************************)
-
-inheritedImplementations = {"MultiPatch"};
-
 (******************************************************************************)
 (* Construct the thorns *)
 (******************************************************************************)
@@ -248,24 +115,5 @@ CreateKrancThornTT [groups, ".", "ML_WaveToy",
   DeclaredGroups -> declaredGroupNames,
   PartialDerivatives -> derivatives,
   UseLoopControl -> True,
-  EvolutionTimelevels -> evolutionTimelevels,
-  InheritedImplementations -> inheritedImplementations
-];
-
-
-
-calculationsFO = 
-{
-  initialCalcFO,
-  evolCalcFO,
-  constraintsCalcFO
-};
-
-CreateKrancThornTT [groupsFO, ".", "ML_FOWaveToy",
-  Calculations -> calculationsFO,
-  DeclaredGroups -> declaredGroupNamesFO,
-  PartialDerivatives -> derivatives,
-  UseLoopControl -> True,
-  EvolutionTimelevels -> evolutionTimelevels,
-  InheritedImplementations -> inheritedImplementations
+  EvolutionTimelevels -> evolutionTimelevels
 ];
diff --git a/m/prototype/ML_BSSN_Helper/interface.ccl b/m/prototype/ML_BSSN_Helper/interface.ccl
index 8ad9ba2..4c57f29 100644
--- a/m/prototype/ML_BSSN_Helper/interface.ccl
+++ b/m/prototype/ML_BSSN_Helper/interface.ccl
@@ -6,5 +6,32 @@ USES INCLUDE: Symmetry.h
 
 
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+CCTK_INT FUNCTION MoLRegisterConstrainedGroup \
+    (CCTK_INT IN ConstrainedIndex)
+USES FUNCTION MoLRegisterConstrainedGroup
+
+CCTK_INT FUNCTION                         \
+    Boundary_SelectGroupForBC             \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+          CCTK_INT IN faces,              \
+          CCTK_INT IN boundary_width,     \
+          CCTK_INT IN table_handle,       \
+          CCTK_STRING IN group_name,      \
+          CCTK_STRING IN bc_name)
 USES FUNCTION Boundary_SelectGroupForBC
+
+CCTK_INT FUNCTION                         \
+    ExtrapolateGammas                     \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY INOUT var)
+USES FUNCTION ExtrapolateGammas
+
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+USES FUNCTION NewRad_Apply
diff --git a/m/prototype/ML_BSSN_Helper/param.ccl b/m/prototype/ML_BSSN_Helper/param.ccl
index 605ea7a..338d0a2 100644
--- a/m/prototype/ML_BSSN_Helper/param.ccl
+++ b/m/prototype/ML_BSSN_Helper/param.ccl
@@ -1,3 +1,7 @@
+SHARES: Boundary
+
+USES CCTK_INT radpower
+
 SHARES: MethodofLines
 
 USES CCTK_INT MoL_Num_Constrained_Vars
@@ -15,6 +19,13 @@ SHARES: ML_BSSN
 USES CCTK_INT timelevels
 USES KEYWORD calculate_ADMBase_variables_at
 
+USES CCTK_REAL harmonicF
+
+EXTENDS KEYWORD my_rhs_boundary_condition
+{
+  "NewRad" :: "NewRad"
+}
+
 PRIVATE:
 
 CCTK_INT ML_BSSN_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
diff --git a/m/prototype/ML_BSSN_Helper/schedule.ccl b/m/prototype/ML_BSSN_Helper/schedule.ccl
index a2134a1..48bea28 100644
--- a/m/prototype/ML_BSSN_Helper/schedule.ccl
+++ b/m/prototype/ML_BSSN_Helper/schedule.ccl
@@ -62,6 +62,33 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN")) {
   
   
   
+  if (CCTK_EQUALS (my_rhs_boundary_condition, "NewRad"))
+  {
+    SCHEDULE ML_BSSN_ExtrapolateGammas AT initial AFTER ML_BSSN_convertFromADMBaseGamma
+    {
+      LANG: C
+      SYNC: ML_Gamma
+      SYNC: ML_dtlapse
+      SYNC: ML_dtshift
+    } "Extrapolate Gammas and time derivatives of lapse and shift"
+    
+    SCHEDULE ML_BSSN_NewRad IN ML_BSSN_evolCalcGroup AFTER ML_BSSN_RHS
+    {
+      LANG: C
+      SYNC: ML_curvrhs
+      SYNC: ML_dtlapserhs
+      SYNC: ML_dtshiftrhs
+      SYNC: ML_Gammarhs
+      SYNC: ML_lapserhs
+      SYNC: ML_log_confacrhs
+      SYNC: ML_metricrhs
+      SYNC: ML_shiftrhs
+      SYNC: ML_trace_curvrhs
+    } "Apply NewRad boundary conditions to RHS"
+  }
+  
+  
+  
   SCHEDULE GROUP ML_BSSN_convertToADMBaseGroup IN ML_BSSN_convertToADMBaseGroupWrapper
   {
   } "Calculate ADM variables"
diff --git a/m/prototype/ML_BSSN_Helper/src/make.code.defn b/m/prototype/ML_BSSN_Helper/src/make.code.defn
index dcfe66e..7cc4e72 100644
--- a/m/prototype/ML_BSSN_Helper/src/make.code.defn
+++ b/m/prototype/ML_BSSN_Helper/src/make.code.defn
@@ -1,3 +1,3 @@
 # -*-Makefile-*-
-SRCS = RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
+SRCS = ExtrapolateGammas.c NewRad.c RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
 #  CopyADMBase.c