diff --git a/Makefile b/Makefile
index d109f0f..99dc132 100644
--- a/Makefile
+++ b/Makefile
@@ -10,16 +10,16 @@ INCLUDE_DIR = ./include
 
 # Compiler flags
 OPTIMISE = -O3
-DEBUG    = 
+DEBUG    =
 
 # Includes and libraries
 INCLUDE  = -I$(INCLUDE_DIR) -I$(THRUST_DIR) -I${DEDISP_DIR}/include -I${CUDA_DIR}/include -I./tclap
-LIBS = -L$(CUDA_DIR)/lib64 -lcuda -lcudart -L${DEDISP_DIR}/lib -ldedisp -lcufft -lpthread -lnvToolsExt
+LIBS = -L$(CUDA_DIR)/lib64 -lcudart -L${DEDISP_DIR}/lib -ldedisp -lcufft -lpthread -lnvToolsExt
 
 # compiler flags
 # --compiler-options -Wall
-NVCC_COMP_FLAGS = -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30
-NVCCFLAGS  = ${UCFLAGS} ${OPTIMISE} ${NVCC_COMP_FLAGS} --machine 64 -Xcompiler ${DEBUG} 
+NVCC_COMP_FLAGS = -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
+NVCCFLAGS  = ${UCFLAGS} ${OPTIMISE} ${NVCC_COMP_FLAGS} --machine 64 -Xcompiler ${DEBUG}
 CFLAGS    = ${UCFLAGS} -fPIC ${OPTIMISE} ${DEBUG}
 
 OBJECTS   = ${OBJ_DIR}/kernels.o
@@ -30,7 +30,7 @@ all: directories ${OBJECTS} ${EXE_FILES}
 ${OBJ_DIR}/kernels.o: ${SRC_DIR}/kernels.cu
 	${NVCC} -c ${NVCCFLAGS} ${INCLUDE} $<  -o $@
 
-${BIN_DIR}/peasoup: ${SRC_DIR}/pipeline_multi.cpp ${OBJECTS}
+${BIN_DIR}/peasoup: ${SRC_DIR}/pipeline_multi.cu ${OBJECTS}
 	${NVCC} ${NVCCFLAGS} ${INCLUDE} ${LIBS} $^ -o $@
 
 ${BIN_DIR}/harmonic_sum_test: ${SRC_DIR}/harmonic_sum_test.cpp ${OBJECTS}
@@ -63,4 +63,4 @@ directories:
 
 clean:
 	@rm -rf ${BIN_DIR}/*	
-	@rm -rf ${OBJ_DIR}/*
\ No newline at end of file
+	@rm -rf ${OBJ_DIR}/*
diff --git a/Makefile.PSG.inc b/Makefile.PSG.inc
new file mode 100644
index 0000000..25b05f0
--- /dev/null
+++ b/Makefile.PSG.inc
@@ -0,0 +1,17 @@
+# This is where common definitions go
+
+#cuda setup
+CUDA_DIR   = /shared/apps/cuda/CUDA-v6.0.26
+
+#Thrust 1.7.1 or higher
+THRUST_DIR = $(CUDA_DIR)/include
+
+#dedisp setup
+DEDISP_DIR = /home-2/jkraus/workspace/PulsarSearch/dedisp
+
+GCC       = gcc
+GXX       = g++
+AR        = ar
+NVCC      = $(CUDA_DIR)/bin/nvcc -lineinfo
+SHELL     = /bin/bash
+UCFLAGS   = -DUSE_NVTX
diff --git a/src/pipeline_multi.cpp b/src/pipeline_multi.cu
similarity index 100%
rename from src/pipeline_multi.cpp
rename to src/pipeline_multi.cu