diff --git a/makefile b/makefile
index b510dcf9aada17ca95afdab76a296d472e9950ff..ca3ef362444d45d38e0e3d49faf8065d802a8e77 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,8 @@
 ### Paths, libraries, includes, options
 
-CUDA_PATH ?= /Developer/NVIDIA/CUDA-6.5
+# CUDA_PATH ?= /Developer/NVIDIA/CUDA-6.5
+CUDA_PATH ?= /software/cuda-toolkit-4.1-x86_64/cuda
+
 #CUDA_PATH ?= /usr/local/encap/cuda-5.5
 
 include ./findcudalib.mk
diff --git a/nvcc.sh b/nvcc.sh
index 71db27f9b1ff9aa712bc926bf2318d6b0a9e466a..bae8b3a288994d441976d825bd81f0f12532be29 100755
--- a/nvcc.sh
+++ b/nvcc.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
 # Usage: source nvcc.sh
 
+module load cuda-toolkit
+# /software/cuda-toolkit-4.1-x86_64/cuda/bin/nvcc
+
 # Add CUDA 'bin' folder to PATH
-export PATH="/Developer/NVIDIA/CUDA-5.5/bin:$PATH"
+# export PATH="/Developer/NVIDIA/CUDA-5.5/bin:$PATH"
 
 # Remove duplicate entries from PATH
-PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
+# PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')