diff --git a/Makefile.Defines b/Makefile.Defines
index 75c4e0ad2..81d895df0 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -62,7 +62,7 @@ OPTIMIZE = -qopt-report=5
 #FFLAGS  = -init=snan,arrays -traceback -no-wrap-margin -O3 -g -CB -nogen-interfaces -no-pie -fp-speculation=safe $(SIMDVEC) $(PAR) #$(HEAPARR)
 FORTRAN = ifort
 #FFLAGS  = $(IDEBUG) 
-FFLAGS  = -init=snan,arrays -traceback -no-wrap-margin -O3 -g $(SIMDVEC) $(STRICTREAL) 
+FFLAGS  = -init=snan,arrays -traceback -no-wrap-margin -O2 -g -shared-intel -debug inline-debug-info $(SIMDVEC) $(STRICTREAL) 
 
 
 GDEBUG = -ggdb -g3 -Og -fbacktrace -fbounds-check -fcheck=all -ffpe-trap=zero,invalid,overflow,underflow,denormal
@@ -72,8 +72,8 @@ GMEM = -fsanitize=undefined -fsanitize=address -fsanitize=leak
 GWARNINGS = -Wall -Warray-bounds  -Wimplicit-interface -Wextra -Warray-temporaries
 
 
-FORTRAN = gfortran
-FFLAGS =  -ffree-line-length-none $(GDEBUG) $(GMEM)
+#FORTRAN = gfortran
+#FFLAGS =  -ffree-line-length-none $(GDEBUG) $(GMEM)
 AR     = ar
 
 # DO NOT include in CFLAGS the "-c" option to compile object only
diff --git a/examples/rmvs_swifter_comparison/mars_ejecta/config.swiftest.in b/examples/rmvs_swifter_comparison/mars_ejecta/config.swiftest.in
index fd124e6a5..891dcc5e1 100644
--- a/examples/rmvs_swifter_comparison/mars_ejecta/config.swiftest.in
+++ b/examples/rmvs_swifter_comparison/mars_ejecta/config.swiftest.in
@@ -4,7 +4,7 @@
 !NPLMAX         -1                 ! not used
 !NTPMAX         -1                 ! not used
 T0             0.0e0
-TSTOP          365.25e3           ! simulation length in days
+TSTOP          730.50e2           ! simulation length in days
 DT             2e0            ! stepsize in days 
 ISTEP_OUT      73500                   ! output cadence
 ISTEP_DUMP     73500                   ! system dump cadence
diff --git a/examples/rmvs_swifter_comparison/mars_ejecta/param.swifter.in b/examples/rmvs_swifter_comparison/mars_ejecta/param.swifter.in
index 67e4ed92a..ae310fadd 100644
--- a/examples/rmvs_swifter_comparison/mars_ejecta/param.swifter.in
+++ b/examples/rmvs_swifter_comparison/mars_ejecta/param.swifter.in
@@ -28,3 +28,4 @@ ENC_OUT        enc.swifter.dat
 EXTRA_FORCE    no                  ! no extra user-defined forces
 BIG_DISCARD    yes                 ! output all planets if anything discarded
 RHILL_PRESENT  yes                 ! Hill's sphere radii in input file
+EUCL_THRESHOLD  999999999
diff --git a/src/whm/whm_setup.f90 b/src/whm/whm_setup.f90
index 3db8ee067..da3258df5 100644
--- a/src/whm/whm_setup.f90
+++ b/src/whm/whm_setup.f90
@@ -90,7 +90,7 @@ module subroutine whm_setup_system(self, config)
          class is (whm_pl)
             call pl%set_mu(self%cb)
             if (config%lgr) call pl%gr_vh2pv(config)
-            call pl%eucl_index()
+            !call pl%eucl_index()
          end select
       end if