diff --git a/Makefile b/Makefile
index f7c4a7a592edf8ca806ea181c988b89a52a1dff5..60a1e3831f0ccf4352609e401332e5cdffbfaf13 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 # Gaia GSRPar Makefile
 
-COMPILER = /opt/openmpi_icc/bin/mpic++ -openmp -DOMP
+COMPILER = /opt/ompss/bin/mcc
 ##COMPILER = /opt/openmpi_icc/bin/mpic++ 
-COMPILERCPP =  /opt/openmpi_icc/bin/mpic++ -openmp  -DOMP
+COMPILERCPP =  /opt/ompss/bin/mcxx --ompss -DOMP
 ##COMPILERCPP =  /opt/openmpi_icc/bin/mpic++ 
 
 CC = $(COMPILERCPP)
@@ -31,12 +31,12 @@ MEMREQ= memRequest.o
 
 
 
-INCLUDE = -I$(GAIAINC) -I/opt/local/include -I/opt/openmpi_icc/include/ -I/opt/cfitsio3_1_0/include/
+INCLUDE = -I$(GAIAINC) -I/opt/local/include -I/opt/openmpi_icc/include/ -I/opt/cfitsio3_1_0/include/ -I/opt/openmpi/include -pthread
 #INCLUDE = -I$(GAIAINC) 
 #CFLAGS= $(INCLUDE)  -std=c99 
 CPPFLAGS= $(INCLUDE)   -g -fsanitize=address -mllvm -asan-stack
 CPPFLAGS= $(INCLUDE)    
-LIB = -L$(CFITSIOLIB) -lcfitsio -lm
+LIB = 	-pthread -L/usr/local/pbspro/lib -Wl,-rpath -Wl,/usr/local/pbspro/lib -Wl,-rpath -Wl,/opt/openmpi/lib -Wl,--enable-new-dtags -L/opt/openmpi/lib -lmpi	 -L$(CFITSIOLIB) -lcfitsio -lm
 
 all:	GaiaGsrParSim