diff --git a/src/Makefile b/src/Makefile
index 5f46f26..4af8f2d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,98 +1,98 @@
 PROGRAM_NAME := liblenstoolhpc.so
 #CXX=g++ -lm -ffast-math -ftree-loop-vectorize 
 CXX=icpc
 
 program_CXX_SRCS := $(wildcard *.cpp)
 #program_CXX_SRCS += $(wildcard ../../*.cpp) #Find C++ source files from additonal directories
 program_CXX_OBJS := ${program_CXX_SRCS:.cpp=.o}
 
 program_C_SRCS := $(wildcard *.c)
 #program_CXX_SRCS += $(wildcard ../../*.c) #Find C source files from additonal directories
 program_C_OBJS := ${program_C_SRCS:.c=.o}
 #
 program_CU_SRCS := $(wildcard *.cu)
 #program_CU_SRCS += $(wildcard ../../*.cu) #Find CUDA source files from additional directories
 #program_CU_HEADERS := $(wildcard *.cuh) #Optional: Include .cuh files as dependencies
 #program_CU_HEADERS += $(wildcard ../../*.cuh) #Find .cuh files from additional directories
 program_CU_OBJS := ${program_CU_SRCS:.cu=.cuo}
 #
 program_INCLUDE_DIRS := . /usr/local/cuda-7.5/include/ #C++ Include directories
 program_INCLUDE_DIRS += $(CFITSIO_ROOT)/include
 program_INCLUDE_DIRS += $(LENSTOOL_ROOT)/include
 program_INCLUDE_DIRS += $(GSL_ROOT)/include
 #program_INCLUDE_DIRS += /users/fgilles/bin/iaca-lin32/include
 #program_CU_INCLUDE_DIRS := /home/users/amclaugh/CUB/cub-1.3.2/ #CUDA Include directories
 #
 program_INCLUDE_LIBS := /usr/lib64/ #Include libraries
 program_INCLUDE_LIBS += $(CFITSIO_ROOT)/lib #Include libraries
 program_INCLUDE_LIBS += $(LENSTOOL_ROOT)/src 
 #program_INCLUDE_LIBS += /home/epfl/cerschae/LENSTOOL/lenstool-6.8.1/src 
 #
 # Compiler flags
 CPPFLAGS += $(foreach includedir,$(program_INCLUDE_DIRS),-I$(includedir))
 CPPFLAGS += $(foreach includelib,$(program_INCLUDE_LIBS),-L$(includelib) )
 #CXXFLAGS += -march=core-avx2 -g -O3 -std=c++0x -Wall -pedantic 
 CPPFLAGS += -fPIC -ftz -qopenmp -xHost -fma -pedantic -lcfitsio
 #CPPFLAGS += -qopt-prefetch-distance=64,8 -qopt-streaming-cache-evict=0 -fPIC -qopenmp -xMIC-AVX512 -fma -g -O3 -std=c++0x -Wall -pedantic
 #CPPFLAGS += -qopt-report=5 -S
 CXXFLAGS += -g -O3 -std=c++0x -Wall 
 #
 #GEN_SM35 := -gencode=arch=compute_35,code=\"sm_35,compute_35\" #Target CC 3.5, for example
 
 NVFLAGS := $(foreach includedir,$(program_INCLUDE_DIRS),-I$(includedir))
 NVFLAGS += -dc -g -O3 -G -rdc=true -Xcompiler "-fpic" #rdc=true needed for separable compilation
 #
 CUO_O_OBJECTS := ${program_CU_OBJS:.cuo=.cuo.o}
 #
 OBJECTS = $(program_CU_OBJS) $(program_CXX_OBJS) $(program_C_OBJS)
 #
 .PHONY: all clean distclean
 #
 all: $(PROGRAM_NAME) 
 #
 debug: CXXFLAGS = -g -O0 -fPIC -std=c++0x -Wall -pedantic -DDEBUG $(EXTRA_FLAGS)
 debug: NVFLAGS = -O0 $(GEN_SM35) -g -G  -Xcompiler $(CPPFLAGS)
 debug: NVFLAGS += $(foreach includedir,$(program_CU_INCLUDE_DIRS),-I$(includedir))
 debug: $(PROGRAM_NAME)
 
 # Rule for compilation of CUDA source (C++ source can be handled automatically)
 %.cuo: %.cu %.cuh
 	nvcc $(NVFLAGS)  -o $@ -dc $<
 
 %.cpp: %.cpp %.h
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $< 
 
 # This is pretty ugly...details below
 # The program depends on both C++ and CUDA Objects, but storing CUDA objects as .o files results in circular dependency
 # warnings from Make. However, nvcc requires that object files for linking end in the .o extension, else it will throw
 # an error saying that it doesn't know how to handle the file. Using a non .o rule for Make and then renaming the file 
 # to have the .o extension for nvcc won't suffice because the program will depend on the non .o file but the files in
 # the directory after compilation will have a .o suffix. Thus, when one goes to recompile the code all files will be
 # recompiled instead of just the ones that have been updated. 
 #
 # The solution below solves these issues by silently converting the non .o suffix needed by make to the .o suffix 
 # required by nvcc, calling nvcc, and then converting back to the non .o suffix for future, dependency-based 
 # compilation.
-#$(PROGRAM_NAME): $(OBJECTS) 
-#	$(CXX) $(CPPFLAGS) -shared -o $@ $(program_CXX_OBJS) $(program_C_OBJS) $(CUO_O_OBJECTS) -llenstool 
+$(PROGRAM_NAME): $(OBJECTS) 
+	$(CXX) $(CPPFLAGS) -shared -o $@ $(program_CXX_OBJS) $(program_C_OBJS) $(CUO_O_OBJECTS) -llenstool 
 
 
 
 
 
-$(PROGRAM_NAME): $(OBJECTS) 
-	@ for cu_obj in $(program_CU_OBJS); \
-	do				\
-		mv $$cu_obj $$cu_obj.o; \
-	done				#append a .o suffix for nvcc
-	$(CXX) $(CPPFLAGS) -shared -o  $@ $(program_CXX_OBJS) $(program_C_OBJS) $(CUO_O_OBJECTS)
-	@ for cu_obj in $(CUO_O_OBJECTS); 	\
-	do					\
-		mv $$cu_obj $${cu_obj%.*};	\
-	done				#remove the .o for make
+#$(PROGRAM_NAME): $(OBJECTS) 
+#	@ for cu_obj in $(program_CU_OBJS); \
+#	do				\
+#		mv $$cu_obj $$cu_obj.o; \
+#	done				#append a .o suffix for nvcc
+#	$(CXX) $(CPPFLAGS) -shared -o  $@ $(program_CXX_OBJS) $(program_C_OBJS) $(CUO_O_OBJECTS)
+#	@ for cu_obj in $(CUO_O_OBJECTS); 	\
+#	do					\
+#		mv $$cu_obj $${cu_obj%.*};	\
+#	done				#remove the .o for make
 
 clean:
 	@- $(RM) $(PROGRAM_NAME) $(OBJECTS) *~ *.o *.optrpt *.so
 
 distclean: clean