diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in
index e343dee10..2ce982a28 100644
--- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in
+++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in
@@ -1,4 +1,4 @@
-39.47692640889762629
+0.00029591220819207776388
 0.0046504672609621575315
 4.7535806948127356533e-12
 -2.2473967953572827815e-18
diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/config.swiftest.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/config.swiftest.in
index 7a75d8951..ce9a380aa 100644
--- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/config.swiftest.in
+++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/config.swiftest.in
@@ -1,7 +1,7 @@
 ! Swiftest input file generated using init_cond.py
 T0             0 
-TSTOP          1.0
-DT             0.0027378507871321013
+TSTOP          365.25
+DT             1.0
 CB_IN          cb.swiftest.in
 PL_IN          pl.swiftest.in
 TP_IN          tp.in
@@ -10,7 +10,7 @@ ISTEP_OUT      1
 ISTEP_DUMP     1
 BIN_OUT        bin.swiftest.dat
 OUT_TYPE       REAL8
-OUT_FORM       XV
+OUT_FORM       EL
 OUT_STAT       REPLACE
 CHK_CLOSE      yes
 CHK_RMIN       0.004650467260962157
@@ -26,4 +26,4 @@ ROTATION       no
 GR             no
 MU2KG          1.988409870698051e+30
 DU2M           149597870700.0
-TU2S           31557600.0
+TU2S           86400.0
diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/init_cond.py b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/init_cond.py
index fc20896c6..d38f942e6 100644
--- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/init_cond.py
+++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/init_cond.py
@@ -20,13 +20,13 @@
 
 MU2KG    = np.longdouble(GMSunSI / GC) #Conversion from mass unit to kg
 DU2M     = np.longdouble(AU2M)         #Conversion from radius unit to centimeters
-TU2S     = np.longdouble(year)         #Conversion from time unit to seconds
+TU2S     = np.longdouble(JD)         #Conversion from time unit to seconds
 GU       = np.longdouble(GC / (DU2M**3 / (MU2KG * TU2S**2)))
 GMSun = np.longdouble(GMSunSI / (DU2M**3 / TU2S**2))
 
 # Solar oblatenes values: From Mecheri et al. (2004), using Corbard (b) 2002 values (Table II)
-J2 = 0.0 #np.longdouble(2.198e-7) * (Rsun / DU2M)**2
-J4 = 0.0 #np.longdouble(-4.805e-9) * (Rsun / DU2M)**4
+J2 = np.longdouble(2.198e-7) * (Rsun / DU2M)**2
+J4 = np.longdouble(-4.805e-9) * (Rsun / DU2M)**4
 
 npl = 9
 ntp = 2 * npl
@@ -190,7 +190,7 @@
 print(f'ISTEP_DUMP    {iout:d}')
 print(f'BIN_OUT       {swifter_bin}')
 print(f'OUT_TYPE      REAL8')
-print(f'OUT_FORM      XV')
+print(f'OUT_FORM      EL')
 print(f'OUT_STAT      NEW')
 print(f'J2            {J2}')
 print(f'J4            {J4}')
@@ -221,7 +221,7 @@
 print(f'ISTEP_DUMP     {iout:d}')
 print(f'BIN_OUT        {swiftest_bin}')
 print(f'OUT_TYPE       REAL8')
-print(f'OUT_FORM       XV')
+print(f'OUT_FORM       EL')
 print(f'OUT_STAT       REPLACE')
 print(f'CHK_CLOSE      yes')
 print(f'CHK_RMIN       {rmin}')
diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in
index b6827600e..1f400dfb2 100644
--- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in
+++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in
@@ -1,7 +1,7 @@
 ! Swifter input file generated using init_cond.py
 T0            0 
-TSTOP         1.0
-DT            0.0027378507871321013
+TSTOP         365.25
+DT            1.0
 PL_IN         pl.swifter.in
 TP_IN         tp.in
 IN_TYPE       ASCII
@@ -9,7 +9,7 @@ ISTEP_OUT     1
 ISTEP_DUMP    1
 BIN_OUT       bin.swifter.dat
 OUT_TYPE      REAL8
-OUT_FORM      XV
+OUT_FORM      EL
 OUT_STAT      NEW
 J2            4.7535806948127355e-12
 J4            -2.2473967953572827e-18
diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/pl.swifter.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/pl.swifter.in
index 55a416e66..c1ddfc2bf 100644
--- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/pl.swifter.in
+++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/pl.swifter.in
@@ -1,40 +1,40 @@
 10
-1 39.47692640889762629
+1 0.00029591220819207776388
 0.0 0.0 0.0
 0.0 0.0 0.0
-2 6.553709809565314e-06 0.0014751258227142052 ! mercury
+2 4.9125474498983625e-11 0.0014751258227142052 ! mercury
 1.6306381826061646e-05
 0.008059842448018334 -0.4616051037329109 -0.03846017738329229
 0.02248719132054853 0.001934639213990692 -0.001904656977422976
-3 9.663313399581539e-05 0.006759134232034941 ! venus
+3 7.243452483873647e-10 0.006759134232034941 ! venus
 4.0453784346544176e-05
 -0.5115875215389065 0.5030818749037324 0.03642547299277956
 -0.01425515725454357 -0.01452868630179309 0.0006232072038298823
-4 0.00012002693582795246 0.010044625087011915 ! earthmoon
+4 8.997011382166019e-10 0.010044625087011915 ! earthmoon
 4.25875607065041e-05
 -0.1090020607540907 -1.009893805009766 4.823302918632528e-05
 0.01682491922568941 -0.001910549762056979 3.992660742687128e-08
-5 1.2739802010675942e-05 0.0072467897902424765 ! mars
+5 9.549535102761465e-11 0.0072467897902424765 ! mars
 2.2657408050928896e-05
 -1.342897929331636 0.9778655112682739 0.05343398538723887
 -0.007712315645393206 -0.01011917844182223 -2.287744801261131e-05
-6 0.037692251088985676 0.3552720805286442 ! jupiter
+6 2.825345908631355e-07 0.3552720805286442 ! jupiter
 0.0004673261703049093
 3.923184193414315 -3.168419770483168 -0.0746147877972047
 0.004655552638985802 0.006232623300954468 -0.0001300429201057457
-7 0.011285899820091273 0.4376460836930155 ! saturn
+7 8.459715183006416e-08 0.4376460836930155 ! saturn
 0.00038925687730393614
 6.185794462795267 -7.804174837804826 -0.110498432926239
 0.004066833203985018 0.003458637040736611 -0.0002219310939327014
-8 0.001723658947826773 0.46946272948265794 ! uranus
+8 1.2920249163736674e-08 0.46946272948265794 ! uranus
 0.00016953449859497232
 14.9290976575471 12.92949673572929 -0.1454099139559955
 -0.002599557960646664 0.002795888198858545 4.391864857782088e-05
-9 0.0020336100526728304 0.78119478483336 ! neptune
+9 1.5243589003230834e-08 0.78119478483336 ! neptune
 0.00016458790412449367
 29.54416169025338 -4.716921603714237 -0.5838030174427992
 0.0004792636209523189 0.00312573757291745 -7.53264045199501e-05
-10 2.924216771029454e-07 0.05379680851617536 ! plutocharon
+10 2.1919422829042796e-12 0.05379680851617536 ! plutocharon
 7.943294877391593e-06
 14.54448346259197 -31.05223519593471 -0.8828000265625595
 0.002923077617691739 0.0006625916902153526 -0.0009142553677224461
diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/pl.swiftest.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/pl.swiftest.in
index c0d273ca7..02a8f9bef 100644
--- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/pl.swiftest.in
+++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/pl.swiftest.in
@@ -1,37 +1,37 @@
 9
-2 6.553709809565314e-06 ! mercury
+2 4.9125474498983625e-11 ! mercury
 1.6306381826061646e-05
 0.008059842448018334 -0.4616051037329109 -0.03846017738329229
 0.02248719132054853 0.001934639213990692 -0.001904656977422976
-3 9.663313399581539e-05 ! venus
+3 7.243452483873647e-10 ! venus
 4.0453784346544176e-05
 -0.5115875215389065 0.5030818749037324 0.03642547299277956
 -0.01425515725454357 -0.01452868630179309 0.0006232072038298823
-4 0.00012002693582795246 ! earthmoon
+4 8.997011382166019e-10 ! earthmoon
 4.25875607065041e-05
 -0.1090020607540907 -1.009893805009766 4.823302918632528e-05
 0.01682491922568941 -0.001910549762056979 3.992660742687128e-08
-5 1.2739802010675942e-05 ! mars
+5 9.549535102761465e-11 ! mars
 2.2657408050928896e-05
 -1.342897929331636 0.9778655112682739 0.05343398538723887
 -0.007712315645393206 -0.01011917844182223 -2.287744801261131e-05
-6 0.037692251088985676 ! jupiter
+6 2.825345908631355e-07 ! jupiter
 0.0004673261703049093
 3.923184193414315 -3.168419770483168 -0.0746147877972047
 0.004655552638985802 0.006232623300954468 -0.0001300429201057457
-7 0.011285899820091273 ! saturn
+7 8.459715183006416e-08 ! saturn
 0.00038925687730393614
 6.185794462795267 -7.804174837804826 -0.110498432926239
 0.004066833203985018 0.003458637040736611 -0.0002219310939327014
-8 0.001723658947826773 ! uranus
+8 1.2920249163736674e-08 ! uranus
 0.00016953449859497232
 14.9290976575471 12.92949673572929 -0.1454099139559955
 -0.002599557960646664 0.002795888198858545 4.391864857782088e-05
-9 0.0020336100526728304 ! neptune
+9 1.5243589003230834e-08 ! neptune
 0.00016458790412449367
 29.54416169025338 -4.716921603714237 -0.5838030174427992
 0.0004792636209523189 0.00312573757291745 -7.53264045199501e-05
-10 2.924216771029454e-07 ! plutocharon
+10 2.1919422829042796e-12 ! plutocharon
 7.943294877391593e-06
 14.54448346259197 -31.05223519593471 -0.8828000265625595
 0.002923077617691739 0.0006625916902153526 -0.0009142553677224461
diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb
index b8e418539..ed3e55e8a 100644
--- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb
+++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb
@@ -67,6 +67,508 @@
     "swiftdiff = swiftdiff.rename({'time' : 'time (d)'})"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 25,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div><svg style=\"position: absolute; width: 0; height: 0; overflow: hidden\">\n",
+       "<defs>\n",
+       "<symbol id=\"icon-database\" viewBox=\"0 0 32 32\">\n",
+       "<path d=\"M16 0c-8.837 0-16 2.239-16 5v4c0 2.761 7.163 5 16 5s16-2.239 16-5v-4c0-2.761-7.163-5-16-5z\"></path>\n",
+       "<path d=\"M16 17c-8.837 0-16-2.239-16-5v6c0 2.761 7.163 5 16 5s16-2.239 16-5v-6c0 2.761-7.163 5-16 5z\"></path>\n",
+       "<path d=\"M16 26c-8.837 0-16-2.239-16-5v6c0 2.761 7.163 5 16 5s16-2.239 16-5v-6c0 2.761-7.163 5-16 5z\"></path>\n",
+       "</symbol>\n",
+       "<symbol id=\"icon-file-text2\" viewBox=\"0 0 32 32\">\n",
+       "<path d=\"M28.681 7.159c-0.694-0.947-1.662-2.053-2.724-3.116s-2.169-2.030-3.116-2.724c-1.612-1.182-2.393-1.319-2.841-1.319h-15.5c-1.378 0-2.5 1.121-2.5 2.5v27c0 1.378 1.122 2.5 2.5 2.5h23c1.378 0 2.5-1.122 2.5-2.5v-19.5c0-0.448-0.137-1.23-1.319-2.841zM24.543 5.457c0.959 0.959 1.712 1.825 2.268 2.543h-4.811v-4.811c0.718 0.556 1.584 1.309 2.543 2.268zM28 29.5c0 0.271-0.229 0.5-0.5 0.5h-23c-0.271 0-0.5-0.229-0.5-0.5v-27c0-0.271 0.229-0.5 0.5-0.5 0 0 15.499-0 15.5 0v7c0 0.552 0.448 1 1 1h7v19.5z\"></path>\n",
+       "<path d=\"M23 26h-14c-0.552 0-1-0.448-1-1s0.448-1 1-1h14c0.552 0 1 0.448 1 1s-0.448 1-1 1z\"></path>\n",
+       "<path d=\"M23 22h-14c-0.552 0-1-0.448-1-1s0.448-1 1-1h14c0.552 0 1 0.448 1 1s-0.448 1-1 1z\"></path>\n",
+       "<path d=\"M23 18h-14c-0.552 0-1-0.448-1-1s0.448-1 1-1h14c0.552 0 1 0.448 1 1s-0.448 1-1 1z\"></path>\n",
+       "</symbol>\n",
+       "</defs>\n",
+       "</svg>\n",
+       "<style>/* CSS stylesheet for displaying xarray objects in jupyterlab.\n",
+       " *\n",
+       " */\n",
+       "\n",
+       ":root {\n",
+       "  --xr-font-color0: var(--jp-content-font-color0, rgba(0, 0, 0, 1));\n",
+       "  --xr-font-color2: var(--jp-content-font-color2, rgba(0, 0, 0, 0.54));\n",
+       "  --xr-font-color3: var(--jp-content-font-color3, rgba(0, 0, 0, 0.38));\n",
+       "  --xr-border-color: var(--jp-border-color2, #e0e0e0);\n",
+       "  --xr-disabled-color: var(--jp-layout-color3, #bdbdbd);\n",
+       "  --xr-background-color: var(--jp-layout-color0, white);\n",
+       "  --xr-background-color-row-even: var(--jp-layout-color1, white);\n",
+       "  --xr-background-color-row-odd: var(--jp-layout-color2, #eeeeee);\n",
+       "}\n",
+       "\n",
+       "html[theme=dark],\n",
+       "body.vscode-dark {\n",
+       "  --xr-font-color0: rgba(255, 255, 255, 1);\n",
+       "  --xr-font-color2: rgba(255, 255, 255, 0.54);\n",
+       "  --xr-font-color3: rgba(255, 255, 255, 0.38);\n",
+       "  --xr-border-color: #1F1F1F;\n",
+       "  --xr-disabled-color: #515151;\n",
+       "  --xr-background-color: #111111;\n",
+       "  --xr-background-color-row-even: #111111;\n",
+       "  --xr-background-color-row-odd: #313131;\n",
+       "}\n",
+       "\n",
+       ".xr-wrap {\n",
+       "  display: block;\n",
+       "  min-width: 300px;\n",
+       "  max-width: 700px;\n",
+       "}\n",
+       "\n",
+       ".xr-text-repr-fallback {\n",
+       "  /* fallback to plain text repr when CSS is not injected (untrusted notebook) */\n",
+       "  display: none;\n",
+       "}\n",
+       "\n",
+       ".xr-header {\n",
+       "  padding-top: 6px;\n",
+       "  padding-bottom: 6px;\n",
+       "  margin-bottom: 4px;\n",
+       "  border-bottom: solid 1px var(--xr-border-color);\n",
+       "}\n",
+       "\n",
+       ".xr-header > div,\n",
+       ".xr-header > ul {\n",
+       "  display: inline;\n",
+       "  margin-top: 0;\n",
+       "  margin-bottom: 0;\n",
+       "}\n",
+       "\n",
+       ".xr-obj-type,\n",
+       ".xr-array-name {\n",
+       "  margin-left: 2px;\n",
+       "  margin-right: 10px;\n",
+       "}\n",
+       "\n",
+       ".xr-obj-type {\n",
+       "  color: var(--xr-font-color2);\n",
+       "}\n",
+       "\n",
+       ".xr-sections {\n",
+       "  padding-left: 0 !important;\n",
+       "  display: grid;\n",
+       "  grid-template-columns: 150px auto auto 1fr 20px 20px;\n",
+       "}\n",
+       "\n",
+       ".xr-section-item {\n",
+       "  display: contents;\n",
+       "}\n",
+       "\n",
+       ".xr-section-item input {\n",
+       "  display: none;\n",
+       "}\n",
+       "\n",
+       ".xr-section-item input + label {\n",
+       "  color: var(--xr-disabled-color);\n",
+       "}\n",
+       "\n",
+       ".xr-section-item input:enabled + label {\n",
+       "  cursor: pointer;\n",
+       "  color: var(--xr-font-color2);\n",
+       "}\n",
+       "\n",
+       ".xr-section-item input:enabled + label:hover {\n",
+       "  color: var(--xr-font-color0);\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary {\n",
+       "  grid-column: 1;\n",
+       "  color: var(--xr-font-color2);\n",
+       "  font-weight: 500;\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary > span {\n",
+       "  display: inline-block;\n",
+       "  padding-left: 0.5em;\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary-in:disabled + label {\n",
+       "  color: var(--xr-font-color2);\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary-in + label:before {\n",
+       "  display: inline-block;\n",
+       "  content: '►';\n",
+       "  font-size: 11px;\n",
+       "  width: 15px;\n",
+       "  text-align: center;\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary-in:disabled + label:before {\n",
+       "  color: var(--xr-disabled-color);\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary-in:checked + label:before {\n",
+       "  content: '▼';\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary-in:checked + label > span {\n",
+       "  display: none;\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary,\n",
+       ".xr-section-inline-details {\n",
+       "  padding-top: 4px;\n",
+       "  padding-bottom: 4px;\n",
+       "}\n",
+       "\n",
+       ".xr-section-inline-details {\n",
+       "  grid-column: 2 / -1;\n",
+       "}\n",
+       "\n",
+       ".xr-section-details {\n",
+       "  display: none;\n",
+       "  grid-column: 1 / -1;\n",
+       "  margin-bottom: 5px;\n",
+       "}\n",
+       "\n",
+       ".xr-section-summary-in:checked ~ .xr-section-details {\n",
+       "  display: contents;\n",
+       "}\n",
+       "\n",
+       ".xr-array-wrap {\n",
+       "  grid-column: 1 / -1;\n",
+       "  display: grid;\n",
+       "  grid-template-columns: 20px auto;\n",
+       "}\n",
+       "\n",
+       ".xr-array-wrap > label {\n",
+       "  grid-column: 1;\n",
+       "  vertical-align: top;\n",
+       "}\n",
+       "\n",
+       ".xr-preview {\n",
+       "  color: var(--xr-font-color3);\n",
+       "}\n",
+       "\n",
+       ".xr-array-preview,\n",
+       ".xr-array-data {\n",
+       "  padding: 0 5px !important;\n",
+       "  grid-column: 2;\n",
+       "}\n",
+       "\n",
+       ".xr-array-data,\n",
+       ".xr-array-in:checked ~ .xr-array-preview {\n",
+       "  display: none;\n",
+       "}\n",
+       "\n",
+       ".xr-array-in:checked ~ .xr-array-data,\n",
+       ".xr-array-preview {\n",
+       "  display: inline-block;\n",
+       "}\n",
+       "\n",
+       ".xr-dim-list {\n",
+       "  display: inline-block !important;\n",
+       "  list-style: none;\n",
+       "  padding: 0 !important;\n",
+       "  margin: 0;\n",
+       "}\n",
+       "\n",
+       ".xr-dim-list li {\n",
+       "  display: inline-block;\n",
+       "  padding: 0;\n",
+       "  margin: 0;\n",
+       "}\n",
+       "\n",
+       ".xr-dim-list:before {\n",
+       "  content: '(';\n",
+       "}\n",
+       "\n",
+       ".xr-dim-list:after {\n",
+       "  content: ')';\n",
+       "}\n",
+       "\n",
+       ".xr-dim-list li:not(:last-child):after {\n",
+       "  content: ',';\n",
+       "  padding-right: 5px;\n",
+       "}\n",
+       "\n",
+       ".xr-has-index {\n",
+       "  font-weight: bold;\n",
+       "}\n",
+       "\n",
+       ".xr-var-list,\n",
+       ".xr-var-item {\n",
+       "  display: contents;\n",
+       "}\n",
+       "\n",
+       ".xr-var-item > div,\n",
+       ".xr-var-item label,\n",
+       ".xr-var-item > .xr-var-name span {\n",
+       "  background-color: var(--xr-background-color-row-even);\n",
+       "  margin-bottom: 0;\n",
+       "}\n",
+       "\n",
+       ".xr-var-item > .xr-var-name:hover span {\n",
+       "  padding-right: 5px;\n",
+       "}\n",
+       "\n",
+       ".xr-var-list > li:nth-child(odd) > div,\n",
+       ".xr-var-list > li:nth-child(odd) > label,\n",
+       ".xr-var-list > li:nth-child(odd) > .xr-var-name span {\n",
+       "  background-color: var(--xr-background-color-row-odd);\n",
+       "}\n",
+       "\n",
+       ".xr-var-name {\n",
+       "  grid-column: 1;\n",
+       "}\n",
+       "\n",
+       ".xr-var-dims {\n",
+       "  grid-column: 2;\n",
+       "}\n",
+       "\n",
+       ".xr-var-dtype {\n",
+       "  grid-column: 3;\n",
+       "  text-align: right;\n",
+       "  color: var(--xr-font-color2);\n",
+       "}\n",
+       "\n",
+       ".xr-var-preview {\n",
+       "  grid-column: 4;\n",
+       "}\n",
+       "\n",
+       ".xr-var-name,\n",
+       ".xr-var-dims,\n",
+       ".xr-var-dtype,\n",
+       ".xr-preview,\n",
+       ".xr-attrs dt {\n",
+       "  white-space: nowrap;\n",
+       "  overflow: hidden;\n",
+       "  text-overflow: ellipsis;\n",
+       "  padding-right: 10px;\n",
+       "}\n",
+       "\n",
+       ".xr-var-name:hover,\n",
+       ".xr-var-dims:hover,\n",
+       ".xr-var-dtype:hover,\n",
+       ".xr-attrs dt:hover {\n",
+       "  overflow: visible;\n",
+       "  width: auto;\n",
+       "  z-index: 1;\n",
+       "}\n",
+       "\n",
+       ".xr-var-attrs,\n",
+       ".xr-var-data {\n",
+       "  display: none;\n",
+       "  background-color: var(--xr-background-color) !important;\n",
+       "  padding-bottom: 5px !important;\n",
+       "}\n",
+       "\n",
+       ".xr-var-attrs-in:checked ~ .xr-var-attrs,\n",
+       ".xr-var-data-in:checked ~ .xr-var-data {\n",
+       "  display: block;\n",
+       "}\n",
+       "\n",
+       ".xr-var-data > table {\n",
+       "  float: right;\n",
+       "}\n",
+       "\n",
+       ".xr-var-name span,\n",
+       ".xr-var-data,\n",
+       ".xr-attrs {\n",
+       "  padding-left: 25px !important;\n",
+       "}\n",
+       "\n",
+       ".xr-attrs,\n",
+       ".xr-var-attrs,\n",
+       ".xr-var-data {\n",
+       "  grid-column: 1 / -1;\n",
+       "}\n",
+       "\n",
+       "dl.xr-attrs {\n",
+       "  padding: 0;\n",
+       "  margin: 0;\n",
+       "  display: grid;\n",
+       "  grid-template-columns: 125px auto;\n",
+       "}\n",
+       "\n",
+       ".xr-attrs dt,\n",
+       ".xr-attrs dd {\n",
+       "  padding: 0;\n",
+       "  margin: 0;\n",
+       "  float: left;\n",
+       "  padding-right: 10px;\n",
+       "  width: auto;\n",
+       "}\n",
+       "\n",
+       ".xr-attrs dt {\n",
+       "  font-weight: normal;\n",
+       "  grid-column: 1;\n",
+       "}\n",
+       "\n",
+       ".xr-attrs dt:hover span {\n",
+       "  display: inline-block;\n",
+       "  background: var(--xr-background-color);\n",
+       "  padding-right: 10px;\n",
+       "}\n",
+       "\n",
+       ".xr-attrs dd {\n",
+       "  grid-column: 2;\n",
+       "  white-space: pre-wrap;\n",
+       "  word-break: break-all;\n",
+       "}\n",
+       "\n",
+       ".xr-icon-database,\n",
+       ".xr-icon-file-text2 {\n",
+       "  display: inline-block;\n",
+       "  vertical-align: middle;\n",
+       "  width: 1em;\n",
+       "  height: 1.5em !important;\n",
+       "  stroke-width: 0;\n",
+       "  stroke: currentColor;\n",
+       "  fill: currentColor;\n",
+       "}\n",
+       "</style><pre class='xr-text-repr-fallback'>&lt;xarray.DataArray &#x27;e&#x27; (time: 366)&gt;\n",
+       "array([0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999247, 0.99999247, 0.99999247,\n",
+       "       0.99999247, 0.99999247, 0.99999247, 0.99999247, 0.99999248,\n",
+       "       0.99999249, 0.99999264, 0.9999928 , 0.99999281, 0.99999282,\n",
+       "       0.99999282, 0.99999283, 0.99999283, 0.99999283, 0.99999283,\n",
+       "       0.99999283, 0.99999283, 0.99999283, 0.99999283, 0.99999283,\n",
+       "       0.99999283, 0.99999283, 0.99999283, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "...\n",
+       "       0.99999318, 0.99999318, 0.99999318, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.9999932 , 0.99999319, 0.99999319, 0.9999932 ,\n",
+       "       0.9999932 , 0.9999932 , 0.99999321, 0.99999321, 0.99999321,\n",
+       "       0.99999321, 0.99999322, 0.99999322, 0.99999322, 0.99999322,\n",
+       "       0.99999322, 0.99999322, 0.99999322, 0.99999322, 0.99999322,\n",
+       "       0.99999322])\n",
+       "Coordinates:\n",
+       "    id       int64 3\n",
+       "  * time     (time) float64 0.0 0.002738 0.005476 ... 0.9938 0.9966 0.9993</pre><div class='xr-wrap' hidden><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'e'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>time</span>: 366</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-f4414199-af73-4616-8a8c-193ad0e2113d' class='xr-array-in' type='checkbox' checked><label for='section-f4414199-af73-4616-8a8c-193ad0e2113d' title='Show/hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-array-preview xr-preview'><span>1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 ... 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0</span></div><div class='xr-array-data'><pre>array([0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999247, 0.99999247, 0.99999247,\n",
+       "       0.99999247, 0.99999247, 0.99999247, 0.99999247, 0.99999248,\n",
+       "       0.99999249, 0.99999264, 0.9999928 , 0.99999281, 0.99999282,\n",
+       "       0.99999282, 0.99999283, 0.99999283, 0.99999283, 0.99999283,\n",
+       "       0.99999283, 0.99999283, 0.99999283, 0.99999283, 0.99999283,\n",
+       "       0.99999283, 0.99999283, 0.99999283, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "...\n",
+       "       0.99999318, 0.99999318, 0.99999318, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.9999932 , 0.99999319, 0.99999319, 0.9999932 ,\n",
+       "       0.9999932 , 0.9999932 , 0.99999321, 0.99999321, 0.99999321,\n",
+       "       0.99999321, 0.99999322, 0.99999322, 0.99999322, 0.99999322,\n",
+       "       0.99999322, 0.99999322, 0.99999322, 0.99999322, 0.99999322,\n",
+       "       0.99999322])</pre></div></div></li><li class='xr-section-item'><input id='section-dab6d1ae-3ff2-460e-86e7-5871178b8663' class='xr-section-summary-in' type='checkbox'  checked><label for='section-dab6d1ae-3ff2-460e-86e7-5871178b8663' class='xr-section-summary' >Coordinates: <span>(2)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><ul class='xr-var-list'><li class='xr-var-item'><div class='xr-var-name'><span>id</span></div><div class='xr-var-dims'>()</div><div class='xr-var-dtype'>int64</div><div class='xr-var-preview xr-preview'>3</div><input id='attrs-8efb12c3-6a2b-4785-93d7-01c57721f24a' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-8efb12c3-6a2b-4785-93d7-01c57721f24a' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-445ce0a5-3943-4cd7-adfb-016aab10a48a' class='xr-var-data-in' type='checkbox'><label for='data-445ce0a5-3943-4cd7-adfb-016aab10a48a' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array(3)</pre></div></li><li class='xr-var-item'><div class='xr-var-name'><span class='xr-has-index'>time</span></div><div class='xr-var-dims'>(time)</div><div class='xr-var-dtype'>float64</div><div class='xr-var-preview xr-preview'>0.0 0.002738 ... 0.9966 0.9993</div><input id='attrs-aeb30f0e-10c1-428b-80e5-f79c4e47d03c' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-aeb30f0e-10c1-428b-80e5-f79c4e47d03c' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-bf1a0299-c559-4c14-ab53-312213762954' class='xr-var-data-in' type='checkbox'><label for='data-bf1a0299-c559-4c14-ab53-312213762954' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array([0.      , 0.002738, 0.005476, ..., 0.99384 , 0.996578, 0.999316])</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-99a63aec-93b8-471f-a601-43bf3476e5d6' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-99a63aec-93b8-471f-a601-43bf3476e5d6' class='xr-section-summary'  title='Expand/collapse section'>Attributes: <span>(0)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><dl class='xr-attrs'></dl></div></li></ul></div></div>"
+      ],
+      "text/plain": [
+       "<xarray.DataArray 'e' (time: 366)>\n",
+       "array([0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999245,\n",
+       "       0.99999245, 0.99999245, 0.99999245, 0.99999245, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999246, 0.99999246, 0.99999246,\n",
+       "       0.99999246, 0.99999246, 0.99999247, 0.99999247, 0.99999247,\n",
+       "       0.99999247, 0.99999247, 0.99999247, 0.99999247, 0.99999248,\n",
+       "       0.99999249, 0.99999264, 0.9999928 , 0.99999281, 0.99999282,\n",
+       "       0.99999282, 0.99999283, 0.99999283, 0.99999283, 0.99999283,\n",
+       "       0.99999283, 0.99999283, 0.99999283, 0.99999283, 0.99999283,\n",
+       "       0.99999283, 0.99999283, 0.99999283, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "       0.99999284, 0.99999284, 0.99999284, 0.99999284, 0.99999284,\n",
+       "...\n",
+       "       0.99999318, 0.99999318, 0.99999318, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.99999319, 0.99999319, 0.99999319, 0.99999319,\n",
+       "       0.99999319, 0.9999932 , 0.99999319, 0.99999319, 0.9999932 ,\n",
+       "       0.9999932 , 0.9999932 , 0.99999321, 0.99999321, 0.99999321,\n",
+       "       0.99999321, 0.99999322, 0.99999322, 0.99999322, 0.99999322,\n",
+       "       0.99999322, 0.99999322, 0.99999322, 0.99999322, 0.99999322,\n",
+       "       0.99999322])\n",
+       "Coordinates:\n",
+       "    id       int64 3\n",
+       "  * time     (time) float64 0.0 0.002738 0.005476 ... 0.9938 0.9966 0.9993"
+      ]
+     },
+     "execution_count": 25,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "swiftestdat['e'].sel(id=3)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 6,
diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in
index e6f3153e4..c17f59612 100644
--- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in
+++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in
@@ -1,4 +1,55 @@
-1
+18
+101
+0.008082903154349985 -0.4615820430265793 -0.03846017738329229
+0.025090740792557683 0.001934639213990692 -0.001904656977422976
+110
+0.008036781741686682 -0.46162816443924254 -0.03846017738329229
+0.019883641848539375 0.001934639213990692 -0.001904656977422976
 102
 -0.5115303112484343 0.5031390851942046 0.03642547299277956
-2.3040719536228615 -0.01452868630179309 0.0006232072038298823
\ No newline at end of file
+-0.007907923549198176 -0.01452868630179309 0.0006232072038298823
+111
+-0.5116447318293788 0.5030246646132601 0.03642547299277956
+-0.02060239095988896 -0.01452868630179309 0.0006232072038298823
+103
+-0.10894183284815118 -1.0098335771038265 4.823302918632528e-05
+0.023719359459963285 -0.001910549762056979 3.992660742687128e-08
+112
+-0.10906228866003023 -1.0099540329157057 4.823302918632528e-05
+0.009930478991415534 -0.001910549762056979 3.992660742687128e-08
+104
+-1.3428658869178822 0.9778975536820278 0.05343398538723887
+-0.004632836547169314 -0.01011917844182223 -2.287744801261131e-05
+113
+-1.34292997174539 0.97783346885452 0.05343398538723887
+-0.010791794743617099 -0.01011917844182223 -2.287744801261131e-05
+105
+3.923845092422412 -3.167758871475071 -0.0746147877972047
+0.04153776984063323 0.006232623300954468 -0.0001300429201057457
+114
+3.9225232944062176 -3.169080669491265 -0.0746147877972047
+-0.03222666456266163 0.006232623300954468 -0.0001300429201057457
+106
+6.186344955150397 -7.803624345449696 -0.110498432926239
+0.026180002087518608 0.003458637040736611 -0.0002219310939327014
+115
+6.185243970440136 -7.804725330159957 -0.110498432926239
+-0.01804633567954857 0.003458637040736611 -0.0002219310939327014
+107
+14.929337415534302 12.929736493716492 -0.1454099139559955
+0.01049520557801523 0.002795888198858545 4.391864857782088e-05
+116
+14.928857899559898 12.929256977742087 -0.1454099139559955
+-0.015694321499308557 0.002795888198858545 4.391864857782088e-05
+108
+29.544394452699596 -4.716688841268022 -0.5838030174427992
+0.014914899434230449 0.00312573757291745 -7.53264045199501e-05
+117
+29.543928927807162 -4.717154366160452 -0.5838030174427992
+-0.013956372192325811 0.00312573757291745 -7.53264045199501e-05
+109
+14.544494696107316 -31.052223962419365 -0.8828000265625595
+0.003711039980269588 0.0006625916902153526 -0.0009142553677224461
+118
+14.544472229076623 -31.052246429450054 -0.8828000265625595
+0.00213511525511389 0.0006625916902153526 -0.0009142553677224461