diff --git a/Makefile b/Makefile
index 09fcfcc0b..1f5a9828b 100644
--- a/Makefile
+++ b/Makefile
@@ -259,5 +259,4 @@ clean:
 	cd $(SWIFTEST_HOME)/include; rm -f *.mod *.smod 
 	cd $(COLLRESOLVE_HOME); rm -rf autom4te.cache aux Makefile stamp-h1 configure config.status config.h config.log aclocal.m4 lib* *.in *.o *.lo cambioni2019/*.o cambioni2019/*.lo
 
-
-force:
\ No newline at end of file
+force:
diff --git a/Makefile.Defines b/Makefile.Defines
index 8339f5617..a5417a18d 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -48,13 +48,13 @@ COLLRESOLVE_HOME = $(ROOT_DIR)/collresolve/
 
 # DO NOT include in FFLAGS the "-c" option to compile object only
 # this is done explicitly as needed in the Makefile
-ADVIXE_FLAGS = -g -O2 -qopt-report=5 -vecabi=cmdtarget -simd -shared-intel -debug inline-debug-info -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -xhost -traceback 
+ADVIXE_FLAGS = -g -O2 -qopt-report=5 -vecabi=cmdtarget -simd -shared-intel -debug inline-debug-info -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -xhost -traceback -I$(ADVISOR_2019_DIR)/include/intel64 -parallel-source-info=2 
 #Be sure to set the environment variable KMP_FORKJOIN_FRAMES=1 for OpenMP debuging in vtune
 
 IDEBUG = -O0 -init=snan,arrays  -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -qopt-matmul -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin
 STRICTREAL = -fp-model=precise -prec-div -prec-sqrt -assume protect-parens 
 SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdtarget -fp-model no-except -fma
-PAR = -qopenmp -parallel -parallel-source-info=2  
+PAR = -qopenmp -parallel
 HEAPARR = -heap-arrays 4194304 
 OPTREPORT = -qopt-report=5 
 IPRODUCTION = -no-wrap-margin -O3 -qopt-prefetch=0 -qopt-matmul -sox $(PAR) $(SIMDVEC) #$(HEAPARR)
@@ -66,11 +66,11 @@ GMEM =  -fsanitize-address-use-after-scope -fstack-check  -fsanitize=bounds-stri
 GWARNINGS = -Wall -Warray-bounds  -Wimplicit-interface -Wextra -Warray-temporaries
 GPRODUCTION = -O3 -ffree-line-length-none $(GPAR)
 
-INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include -I$(ADVISOR_2019_DIR)/include/intel64
-LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib -L$(ADVISOR_2019_DIR)/lib64 -lswiftest -lnetcdf -lnetcdff -ladvisor  -qopt-matmul $(PAR)
+INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include 
+LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib -L$(ADVISOR_2019_DIR)/lib64 -lswiftest -lnetcdf -lnetcdff  -qopt-matmul $(PAR)
 
-FSTRICTFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR)
-FFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR)
+FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) -g -traceback
+FFLAGS  = $(IPRODUCTION) -fp-model=fast -g -traceback
 
 FORTRAN = ifort
 AR     = xiar
@@ -88,4 +88,3 @@ CC    = icc
 CFLAGS          = -O3 -w -m64 -std=c99
 
 64_BIT_REALS    = -r8
-