diff --git a/Multipole/test/q1/mp_Psi4_l2_m-1_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l2_m-1_r5.00.tsv
index 18cd9f98..37c41576 100644
--- a/Multipole/test/q1/mp_Psi4_l2_m-1_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l2_m-1_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.0002368732758375043611 6.666008712285539305e-07
-0.208333 -0.0001289798240776825439 2.102884778684524451e-06
-0.416667 -6.990571190784418756e-05 1.820370465888030275e-06
-0.625000 -2.958838060523753108e-05 1.288609111325172931e-06
-0.833333 4.008126019214592564e-07 8.015025778262599949e-07
+0.000000 -0.0002368732758374085989 6.666008712489448723e-07
+0.208333 -0.0001289798240775609235 2.10288477866517483e-06
+0.416667 -6.990571190782777545e-05 1.820370465879737823e-06
+0.625000 -2.958838060522839329e-05 1.288609111283530886e-06
+0.833333 4.008126019282729483e-07 8.015025778267603796e-07
diff --git a/Multipole/test/q1/mp_Psi4_l2_m-2_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l2_m-2_r5.00.tsv
index 1ef5fa4e..8200957a 100644
--- a/Multipole/test/q1/mp_Psi4_l2_m-2_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l2_m-2_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.163354474942903366 -0.0008959503180925050938
-0.208333 0.05187591099142307982 -0.001506529300352097301
-0.416667 0.02048718330981963084 -0.001699256910188617952
-0.625000 0.0078792480053175417 -0.001808077189221965735
-0.833333 0.001874578344446319348 -0.001894464669028159912
+0.000000 0.1633544749429033938 -0.0008959503180925144179
+0.208333 0.05187591099142304513 -0.00150652930035209188
+0.416667 0.02048718330981956146 -0.00169925691018859952
+0.625000 0.007879248005317501802 -0.001808077189221954026
+0.833333 0.001874578344446285738 -0.001894464669028157527
diff --git a/Multipole/test/q1/mp_Psi4_l2_m0_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l2_m0_r5.00.tsv
index 318048b8..9c60cf2d 100644
--- a/Multipole/test/q1/mp_Psi4_l2_m0_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l2_m0_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.2419469580598028746 -1.050769619247998585e-17
-0.208333 0.09213899351836686569 -4.561390817482837798e-18
-0.416667 0.04906407256839602493 -4.772096628480222168e-18
-0.625000 0.03135805799914477554 -8.2990404682738569e-18
-0.833333 0.02267446146971279289 -5.788942685070502476e-18
+0.000000 0.2419469580598028746 -9.17332287602294512e-18
+0.208333 0.09213899351836685181 -5.511860362039587528e-18
+0.416667 0.0490640725683959486 -1.513697231927610896e-20
+0.625000 0.03135805799914482411 -8.135563666334416424e-19
+0.833333 0.02267446146971273391 -3.270381614957662645e-18
diff --git a/Multipole/test/q1/mp_Psi4_l2_m1_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l2_m1_r5.00.tsv
index 96a6cef9..cc1338e0 100644
--- a/Multipole/test/q1/mp_Psi4_l2_m1_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l2_m1_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.0002368732758375686814 -6.666008712405688811e-07
-0.208333 -0.0001289798240776148625 -2.102884778673264418e-06
-0.416667 -6.990571190784836174e-05 -1.820370465873329807e-06
-0.625000 -2.958838060522215913e-05 -1.288609111318822725e-06
-0.833333 4.008126019202311116e-07 -8.015025778406075684e-07
+0.000000 -0.0002368732758374528886 -6.666008712586046478e-07
+0.208333 -0.0001289798240775159562 -2.102884778659501403e-06
+0.416667 -6.990571190783539197e-05 -1.820370465881377255e-06
+0.625000 -2.9588380605207807e-05 -1.288609111283960543e-06
+0.833333 4.008126019304260002e-07 -8.01502577827898686e-07
diff --git a/Multipole/test/q1/mp_Psi4_l2_m2_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l2_m2_r5.00.tsv
index 71527de8..835ee38e 100644
--- a/Multipole/test/q1/mp_Psi4_l2_m2_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l2_m2_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.1633544749429036436 0.0008959503180924880718
-0.208333 0.05187591099142306594 0.001506529300352091446
-0.416667 0.02048718330981963778 0.001699256910188612748
-0.625000 0.007879248005317526088 0.001808077189221955327
-0.833333 0.001874578344446308723 0.001894464669028158178
+0.000000 0.1633544749429036158 0.0008959503180924889391
+0.208333 0.05187591099142305207 0.001506529300352091663
+0.416667 0.02048718330981958574 0.001699256910188605375
+0.625000 0.007879248005317508741 0.001808077189221956628
+0.833333 0.001874578344446276848 0.001894464669028156877
diff --git a/Multipole/test/q1/mp_Psi4_l3_m-1_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l3_m-1_r5.00.tsv
index c0dbf66a..37d07701 100644
--- a/Multipole/test/q1/mp_Psi4_l3_m-1_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l3_m-1_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.000201937106973485613 3.338187209424203996e-06
-0.208333 2.823370279533335539e-05 3.234171329304860246e-06
-0.416667 3.670252334485536573e-06 2.669675930051770833e-06
-0.625000 7.4263028553875373e-06 1.98459059072028673e-06
-0.833333 1.7684725137990441e-05 1.316505610969884526e-06
+0.000000 0.0002019371069735790712 3.338187209445547532e-06
+0.208333 2.823370279534878155e-05 3.234171329316988063e-06
+0.416667 3.670252334511862357e-06 2.669675930032729109e-06
+0.625000 7.426302855427991594e-06 1.984590590688558146e-06
+0.833333 1.768472513799926709e-05 1.316505610969211982e-06
diff --git a/Multipole/test/q1/mp_Psi4_l3_m-2_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l3_m-2_r5.00.tsv
index 2646acec..0f6e54d8 100644
--- a/Multipole/test/q1/mp_Psi4_l3_m-2_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l3_m-2_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.1355126252198406434 -0.0009011010091674863951
-0.208333 0.04915961764978991899 -0.001330725751219432196
-0.416667 0.02460624596567990985 -0.001361150302657533357
-0.625000 0.01465651364918085439 -0.001293270554144507634
-0.833333 0.009867770273186450558 -0.001186883901585720916
+0.000000 0.1355126252198405601 -0.0009011010091675004897
+0.208333 0.04915961764978987042 -0.001330725751219431329
+0.416667 0.02460624596567981964 -0.00136115030265751189
+0.625000 0.0146565136491808648 -0.001293270554144483131
+0.833333 0.009867770273186452293 -0.001186883901585733926
diff --git a/Multipole/test/q1/mp_Psi4_l3_m-3_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l3_m-3_r5.00.tsv
index cef96795..9c8668bb 100644
--- a/Multipole/test/q1/mp_Psi4_l3_m-3_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l3_m-3_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.000524357118095527641 -2.906015706869769124e-07
-0.208333 -0.0002068048830773968456 3.385926647986565795e-06
-0.416667 -9.568922284099276761e-05 3.076522253670692801e-06
-0.625000 -3.820651927807334699e-05 2.192978793822451683e-06
-0.833333 -2.516202433590698308e-06 1.377294995151083448e-06
+0.000000 -0.0005243571180955339294 -2.906015706807490497e-07
+0.208333 -0.0002068048830773032518 3.385926647988008716e-06
+0.416667 -9.568922284098191203e-05 3.076522253638092197e-06
+0.625000 -3.820651927804451399e-05 2.192978793815989669e-06
+0.833333 -2.516202433550341e-06 1.377294995143654545e-06
diff --git a/Multipole/test/q1/mp_Psi4_l3_m0_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l3_m0_r5.00.tsv
index 2d4f849a..54e79368 100644
--- a/Multipole/test/q1/mp_Psi4_l3_m0_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l3_m0_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 2.968232104301835745e-16 -0.003708942125617168371
-0.208333 1.033580921254468607e-16 -0.002700740708853890167
-0.416667 4.53008668341722531e-17 -0.002438309625810909653
-0.625000 2.511049163851192872e-17 -0.002281126116044357357
-0.833333 4.849670536070778372e-18 -0.002112721874374070673
+0.000000 2.726748984801768887e-16 -0.003708942125617130641
+0.208333 1.122662747095017036e-16 -0.002700740708853890601
+0.416667 3.984331973174811181e-17 -0.002438309625810964731
+0.625000 3.20438714196911775e-17 -0.002281126116044372969
+0.833333 1.882879114324751928e-17 -0.002112721874374088021
diff --git a/Multipole/test/q1/mp_Psi4_l3_m1_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l3_m1_r5.00.tsv
index e83a001f..5cb517e9 100644
--- a/Multipole/test/q1/mp_Psi4_l3_m1_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l3_m1_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.0002019371069733665947 3.338187209458446574e-06
-0.208333 -2.823370279527272477e-05 3.234171329278771631e-06
-0.416667 -3.670252334466712112e-06 2.669675930006030207e-06
-0.625000 -7.426302855380993124e-06 1.98459059072609187e-06
-0.833333 -1.76847251379898413e-05 1.31650561097931772e-06
+0.000000 -0.000201937106973472196 3.338187209445291728e-06
+0.208333 -2.823370279532186623e-05 3.234171329302602479e-06
+0.416667 -3.670252334490033047e-06 2.66967593001040005e-06
+0.625000 -7.426302855428314313e-06 1.98459059070214159e-06
+0.833333 -1.768472513799584168e-05 1.316505610958838369e-06
diff --git a/Multipole/test/q1/mp_Psi4_l3_m2_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l3_m2_r5.00.tsv
index 240ee50f..c4750bbd 100644
--- a/Multipole/test/q1/mp_Psi4_l3_m2_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l3_m2_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.1355126252198405878 -0.0009011010091674635184
-0.208333 -0.04915961764978987736 -0.001330725751219414849
-0.416667 -0.02460624596567987862 -0.001361150302657522081
-0.625000 -0.01465651364918085092 -0.001293270554144499828
-0.833333 -0.009867770273186445354 -0.001186883901585728939
+0.000000 -0.1355126252198405046 -0.0009011010091674648195
+0.208333 -0.04915961764978981491 -0.001330725751219416367
+0.416667 -0.02460624596567978842 -0.001361150302657512324
+0.625000 -0.01465651364918086133 -0.00129327055414448118
+0.833333 -0.00986777027318644015 -0.001186883901585731324
diff --git a/Multipole/test/q1/mp_Psi4_l3_m3_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l3_m3_r5.00.tsv
index 3cbaba9b..a769f8b9 100644
--- a/Multipole/test/q1/mp_Psi4_l3_m3_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l3_m3_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.0005243571180954178113 -2.906015706817095851e-07
-0.208333 0.0002068048830773277277 3.385926647976474244e-06
-0.416667 9.568922284095472566e-05 3.076522253665459408e-06
-0.625000 3.820651927807477001e-05 2.192978793830618775e-06
-0.833333 2.516202433597053596e-06 1.377294995157096958e-06
+0.000000 0.000524357118095359156 -2.906015706760149826e-07
+0.208333 0.0002068048830772863382 3.385926647986087221e-06
+0.416667 9.568922284097388894e-05 3.076522253618710389e-06
+0.625000 3.820651927804171539e-05 2.19297879381807337e-06
+0.833333 2.516202433555633262e-06 1.377294995168832811e-06
diff --git a/Multipole/test/q1/mp_Psi4_l4_m-1_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m-1_r5.00.tsv
index 0de544a0..409e4750 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m-1_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m-1_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.0004808880142182785263 2.659478161899247858e-06
-0.208333 -0.0001689616980701061388 8.597231952572932136e-07
-0.416667 -8.510800889095376809e-05 5.275020872271219112e-07
-0.625000 -5.377503360423527913e-05 4.009302782582937837e-07
-0.833333 -3.99562899838952761e-05 2.77708617242379142e-07
+0.000000 -0.0004808880142183465057 2.659478161913735086e-06
+0.208333 -0.0001689616980700894421 8.597231952720290458e-07
+0.416667 -8.510800889094081187e-05 5.275020872595902722e-07
+0.625000 -5.377503360422663939e-05 4.009302782831021081e-07
+0.833333 -3.995628998389270112e-05 2.777086172481642712e-07
diff --git a/Multipole/test/q1/mp_Psi4_l4_m-2_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m-2_r5.00.tsv
index b7725bfa..de7faccb 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m-2_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m-2_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.005055290416317105399 -0.003559185638414023335
-0.208333 0.0108900053511946579 -0.002594981294975970843
-0.416667 0.01356998912323651753 -0.002180666702349871346
-0.625000 0.01377036830218968284 -0.001844098398609957286
-0.833333 0.01330299273110349852 -0.001498137182590670961
+0.000000 -0.005055290416317160043 -0.003559185638413964355
+0.208333 0.01089000535119463708 -0.002594981294975960869
+0.416667 0.01356998912323651406 -0.002180666702349831881
+0.625000 0.0137703683021897054 -0.001844098398609926061
+0.833333 0.01330299273110352454 -0.001498137182590676166
diff --git a/Multipole/test/q1/mp_Psi4_l4_m-3_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m-3_r5.00.tsv
index ab20ee51..4809800f 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m-3_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m-3_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.0001112178358866480413 3.297362205391599834e-06
-0.208333 -9.445085072232535419e-05 7.098777028623845491e-06
-0.416667 -5.225274957870029165e-05 6.024654698906587716e-06
-0.625000 -1.435982708063645559e-05 4.288211410874017268e-06
-0.833333 1.651538011306612495e-05 2.707625004414920137e-06
+0.000000 -0.0001112178358865760502 3.29736220539920619e-06
+0.208333 -9.445085072230414449e-05 7.098777028591206771e-06
+0.416667 -5.22527495787021619e-05 6.024654698901477566e-06
+0.625000 -1.435982708063208151e-05 4.2882114108822013e-06
+0.833333 1.651538011308540681e-05 2.707625004402752085e-06
diff --git a/Multipole/test/q1/mp_Psi4_l4_m-4_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m-4_r5.00.tsv
index bcd7cd1b..90c14896 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m-4_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m-4_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.2019000898209012684 -0.001556867632319945943
-0.208333 0.05813063815531462064 -0.002991065145752124996
-0.416667 0.018969135603384122 -0.003483575023355278688
-0.625000 0.003845427354571420188 -0.003737710795409918043
-0.833333 -0.002986575652707265834 -0.003886920451869539921
+0.000000 0.2019000898209011574 -0.001556867632319980854
+0.208333 0.05813063815531454431 -0.0029910651457521302
+0.416667 0.01896913560338407689 -0.003483575023355238789
+0.625000 0.003845427354571419321 -0.003737710795409934089
+0.833333 -0.002986575652707273206 -0.003886920451869554233
diff --git a/Multipole/test/q1/mp_Psi4_l4_m0_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m0_r5.00.tsv
index 2c512a39..6ef432d9 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m0_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m0_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.2402589499819359764 5.30692271210387931e-19
-0.208333 0.07922656565379397609 2.564792825740008553e-19
-0.416667 0.03272551231313391984 1.366342477179387283e-18
-0.625000 0.01334720376285575098 -6.877843701697122642e-19
-0.833333 0.003641226741145835253 1.26432401481009863e-18
+0.000000 0.2402589499819360319 3.638498950571285929e-19
+0.208333 0.07922656565379393445 -9.484674554170262351e-19
+0.416667 0.03272551231313389902 2.446165674662177995e-18
+0.625000 0.01334720376285573537 8.579912998454983653e-19
+0.833333 0.003641226741145816605 -7.186311825508490965e-19
diff --git a/Multipole/test/q1/mp_Psi4_l4_m1_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m1_r5.00.tsv
index 4cc1126e..d1f64b93 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m1_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m1_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.0004808880142184263572 -2.659478161895995251e-06
-0.208333 -0.0001689616980701195016 -8.597231952355324078e-07
-0.416667 -8.510800889099111885e-05 -5.27502087271792523e-07
-0.625000 -5.377503360424549774e-05 -4.009302782507864248e-07
-0.833333 -3.995628998391573364e-05 -2.77708617249410839e-07
+0.000000 -0.0004808880142185214417 -2.659478161868931278e-06
+0.208333 -0.0001689616980701201521 -8.597231952493306804e-07
+0.416667 -8.510800889097077651e-05 -5.275020872835633163e-07
+0.625000 -5.377503360424164204e-05 -4.009302782845154885e-07
+0.833333 -3.995628998390752081e-05 -2.777086172527575191e-07
diff --git a/Multipole/test/q1/mp_Psi4_l4_m2_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m2_r5.00.tsv
index 3f9ba388..60d0d89d 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m2_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m2_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.005055290416317578112 0.003559185638413915349
-0.208333 0.01089000535119449831 0.002594981294975954797
-0.416667 0.01356998912323643079 0.002180666702349865708
-0.625000 0.01377036830218965856 0.001844098398609957286
-0.833333 0.01330299273110349505 0.001498137182590671612
+0.000000 -0.005055290416317605 0.003559185638413935732
+0.208333 0.01089000535119449484 0.002594981294975961302
+0.416667 0.01356998912323645161 0.002180666702349827978
+0.625000 0.0137703683021896707 0.001844098398609913484
+0.833333 0.01330299273110349678 0.001498137182590661854
diff --git a/Multipole/test/q1/mp_Psi4_l4_m3_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m3_r5.00.tsv
index 13d589c9..20babf49 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m3_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m3_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 -0.0001112178358866439484 -3.297362205376403639e-06
-0.208333 -9.445085072235342148e-05 -7.098777028648644922e-06
-0.416667 -5.225274957870720344e-05 -6.024654698887808995e-06
-0.625000 -1.435982708064166823e-05 -4.288211410872141937e-06
-0.833333 1.651538011307720076e-05 -2.707625004411668801e-06
+0.000000 -0.0001112178358865690707 -3.297362205400181125e-06
+0.208333 -9.445085072232704826e-05 -7.098777028633950594e-06
+0.416667 -5.225274957872650902e-05 -6.024654698887001773e-06
+0.625000 -1.435982708063594398e-05 -4.288211410884832185e-06
+0.833333 1.65153801130809853e-05 -2.707625004405567199e-06
diff --git a/Multipole/test/q1/mp_Psi4_l4_m4_r5.00.tsv b/Multipole/test/q1/mp_Psi4_l4_m4_r5.00.tsv
index d7bad749..2ef18d67 100644
--- a/Multipole/test/q1/mp_Psi4_l4_m4_r5.00.tsv
+++ b/Multipole/test/q1/mp_Psi4_l4_m4_r5.00.tsv
@@ -1,5 +1,5 @@
-0.000000 0.201900089820901435 0.001556867632319953532
-0.208333 0.05813063815531467615 0.002991065145752133669
-0.416667 0.01896913560338414975 0.003483575023355263076
-0.625000 0.003845427354571394601 0.003737710795409920211
-0.833333 -0.002986575652707285783 0.00388692045186954209
+0.000000 0.2019000898209013517 0.001556867632319948761
+0.208333 0.05813063815531457901 0.002991065145752118491
+0.416667 0.01896913560338407342 0.003483575023355238789
+0.625000 0.003845427354571391999 0.003737710795409931921
+0.833333 -0.002986575652707294457 0.003886920451869547294
diff --git a/NewRadX/interface.ccl b/NewRadX/interface.ccl
index 123c7162..dd4a5a13 100644
--- a/NewRadX/interface.ccl
+++ b/NewRadX/interface.ccl
@@ -2,8 +2,6 @@
 
 IMPLEMENTS: NewRadX
 
-INHERITS: CarpetX
-
 USES INCLUDE HEADER: loop_device.hxx
 
 INCLUDE HEADER: newradx.hxx in newradx.hxx
diff --git a/TestNewRadX/interface.ccl b/TestNewRadX/interface.ccl
index 16e338e2..46e6394f 100644
--- a/TestNewRadX/interface.ccl
+++ b/TestNewRadX/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: TestNewRadX
 
-INHERITS: CarpetX
+INHERITS: CarpetXRegrid
 
 USES INCLUDE HEADER: loop_device.hxx
 USES INCLUDE HEADER: newradx.hxx
diff --git a/TestNewRadX/schedule.ccl b/TestNewRadX/schedule.ccl
index 0bc7a0df..931ea94c 100644
--- a/TestNewRadX/schedule.ccl
+++ b/TestNewRadX/schedule.ccl
@@ -13,14 +13,14 @@ SCHEDULE TestNewRadX_EstimateError AT postinitial
 {
   LANG: C
   READS: state(everywhere)
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error for regridding"
 
 SCHEDULE TestNewRadX_EstimateError AT poststep
 {
   LANG: C
   READS: state(everywhere)
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error for regridding"
 
 SCHEDULE TestNewRadX_RHS IN ODESolvers_RHS
diff --git a/Z4c/src/adm.cxx b/Z4c/src/adm.cxx
index 21c2f3fe..cb5b9e45 100644
--- a/Z4c/src/adm.cxx
+++ b/Z4c/src/adm.cxx
@@ -10,7 +10,7 @@
 #include <cctk_Parameters.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4c/src/adm2.cxx b/Z4c/src/adm2.cxx
index 3fbdc94c..af8db8fa 100644
--- a/Z4c/src/adm2.cxx
+++ b/Z4c/src/adm2.cxx
@@ -22,7 +22,7 @@
 #include <cctk_Parameters.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4c/src/constraints.cxx b/Z4c/src/constraints.cxx
index faf32e3a..3d04625c 100644
--- a/Z4c/src/constraints.cxx
+++ b/Z4c/src/constraints.cxx
@@ -20,7 +20,7 @@
 #include <cctk_Parameters.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4c/src/enforce.cxx b/Z4c/src/enforce.cxx
index cac7dbb0..f557bf72 100644
--- a/Z4c/src/enforce.cxx
+++ b/Z4c/src/enforce.cxx
@@ -10,7 +10,7 @@
 #include <cctk_Parameters.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4c/src/initial1.cxx b/Z4c/src/initial1.cxx
index da9259c1..f1a28a40 100644
--- a/Z4c/src/initial1.cxx
+++ b/Z4c/src/initial1.cxx
@@ -9,7 +9,7 @@
 #include <cctk_Arguments.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4c/src/initial2.cxx b/Z4c/src/initial2.cxx
index ec18e82a..cebb4284 100644
--- a/Z4c/src/initial2.cxx
+++ b/Z4c/src/initial2.cxx
@@ -8,7 +8,7 @@
 #include <cctk_Arguments.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 namespace Z4c {
diff --git a/Z4c/src/rhs.cxx b/Z4c/src/rhs.cxx
index c8302786..6aaf7b47 100644
--- a/Z4c/src/rhs.cxx
+++ b/Z4c/src/rhs.cxx
@@ -22,7 +22,7 @@
 #include <cctk_Parameters.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4c/src/z4c_vars.hxx b/Z4c/src/z4c_vars.hxx
index 6cce87d2..b8814c92 100644
--- a/Z4c/src/z4c_vars.hxx
+++ b/Z4c/src/z4c_vars.hxx
@@ -538,11 +538,14 @@ template <typename T> struct z4c_vars : z4c_vars_noderivs<T> {
         // Constraints
         // (13)
         ZtC([&](int a) ARITH_INLINE { return (Gamt(a) - Gamtd(a)) / 2; }), //
+        // For the Hamiltonian and momentum constraints, the equations in
+        // 1212.2901 is incorrect, whereas the one in 0912.2920 is correct,
+        // as double-checked by Liwei Ji.
         // (14)
         HC(Rsc //
-           + sum_symm<3>([&](int x, int y)
+           - sum_symm<3>([&](int x, int y)
                              ARITH_INLINE { return At(x, y) * Atu(x, y); }) //
-           - 2 / T(3) * pow2(Kh + 2 * Theta)                                //
+           + 2 / T(3) * pow2(Kh + 2 * Theta)                                //
            - 16 * T(M_PI) * rho),
         // (15)
         MtC([&](int a) ARITH_INLINE {
@@ -554,7 +557,7 @@ template <typename T> struct z4c_vars : z4c_vars_noderivs<T> {
                      return (delta3(a, x) + gammatu(a, x)) *
                             (dKh(x) + 2 * dTheta(x));
                    }) //
-                 - 2 / T(3) * sum<3>([&](int x) ARITH_INLINE {
+                 - 3 / T(2) * sum<3>([&](int x) ARITH_INLINE {
                      return Atu(a, x) * dchi(x) / (1 + chi);
                    }) //
                  - 8 * T(M_PI) * sum<3>([&](int x) ARITH_INLINE {
diff --git a/Z4cow/param.ccl b/Z4cow/param.ccl
index ad3bdf67..5af108c9 100644
--- a/Z4cow/param.ccl
+++ b/Z4cow/param.ccl
@@ -132,6 +132,6 @@ CCTK_INT n_betaG "n power of outgoing boundary r^n fall off rate for beta"
   0:2           :: "1 is my guess"
 } 1
 
-SHARES: CarpetX
+SHARES: Driver
 
 USES BOOLEAN use_subcycling_wip
diff --git a/Z4cow/src/adm.cxx b/Z4cow/src/adm.cxx
index ec676c96..eb670e95 100644
--- a/Z4cow/src/adm.cxx
+++ b/Z4cow/src/adm.cxx
@@ -8,7 +8,7 @@
 #include <cctk_Parameters.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4cow/src/constraint.cxx b/Z4cow/src/constraint.cxx
index f6038f23..3e674bc0 100644
--- a/Z4cow/src/constraint.cxx
+++ b/Z4cow/src/constraint.cxx
@@ -15,7 +15,7 @@
 #include <simd.hxx>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4cow/src/enforce.cxx b/Z4cow/src/enforce.cxx
index 96cfdc87..c3bab50e 100644
--- a/Z4cow/src/enforce.cxx
+++ b/Z4cow/src/enforce.cxx
@@ -8,7 +8,7 @@
 #include <cctk_Parameters.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4cow/src/initial1.cxx b/Z4cow/src/initial1.cxx
index 75302580..37fa4434 100644
--- a/Z4cow/src/initial1.cxx
+++ b/Z4cow/src/initial1.cxx
@@ -7,7 +7,7 @@
 #include <cctk_Arguments.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/Z4cow/src/initial2.cxx b/Z4cow/src/initial2.cxx
index 21607ed1..5ec1bc5c 100644
--- a/Z4cow/src/initial2.cxx
+++ b/Z4cow/src/initial2.cxx
@@ -6,7 +6,7 @@
 #include <cctk_Arguments.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 namespace Z4cow {
diff --git a/Z4cow/src/rhs.cxx b/Z4cow/src/rhs.cxx
index 34add147..3a5bda04 100644
--- a/Z4cow/src/rhs.cxx
+++ b/Z4cow/src/rhs.cxx
@@ -17,7 +17,7 @@
 #include <vec.hxx>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <cmath>
diff --git a/scripts/actions-cuda-real64.cfg b/scripts/actions-cuda-real64.cfg
index f81beb5d..8f9f1bba 100644
--- a/scripts/actions-cuda-real64.cfg
+++ b/scripts/actions-cuda-real64.cfg
@@ -15,7 +15,7 @@ FC = gfortran
 F90 = gfortran
 LD = nvcc
 
-CPPFLAGS = -DSIMD_CPU
+CPPFLAGS = -DSIMD_DISABLE
 CFLAGS = -pipe -g -std=gnu11
 # - We use "--relocatable-device-code=true" to allow building with
 #   debug versions of AMReX
diff --git a/scripts/actions-rocm-real64.cfg b/scripts/actions-rocm-real64.cfg
index 1fe8a0ec..f067f13b 100644
--- a/scripts/actions-rocm-real64.cfg
+++ b/scripts/actions-rocm-real64.cfg
@@ -16,7 +16,7 @@ FC = gfortran
 F90 = gfortran
 LD = /opt/rocm/llvm/bin/clang++
 
-CPPFLAGS = -DSIMD_CPU
+CPPFLAGS = -DSIMD_DISABLE
 CFLAGS = -pipe -g -std=gnu11
 CXXFLAGS = -pipe -g -std=c++17 --offload-arch=gfx90a
 FPPFLAGS = -traditional
diff --git a/scripts/spacetimex.th b/scripts/spacetimex.th
index ed72d1cc..e62a3f44 100644
--- a/scripts/spacetimex.th
+++ b/scripts/spacetimex.th
@@ -153,6 +153,7 @@ CarpetX/Algo
 CarpetX/Arith
 CarpetX/BoxInBox
 CarpetX/CarpetX
+CarpetX/CarpetXRegrid
 CarpetX/CoordinatesX
 CarpetX/Derivs
 CarpetX/ErrorEstimator
@@ -166,7 +167,7 @@ CarpetX/TmunuBaseX
 !TARGET   = $ARR
 !TYPE     = ignore
 !CHECKOUT =
-SpacetimeX/AHFinderDirect
+#SpacetimeX/AHFinderDirect
 SpacetimeX/AHFinderX
 SpacetimeX/BrillLindquist
 SpacetimeX/Cowling