diff --git a/src/MS/Makefile b/src/MS/Makefile
index 3c15a09..f89b226 100644
--- a/src/MS/Makefile
+++ b/src/MS/Makefile
@@ -1,24 +1,24 @@
 OUTPUT=
 CXX=g++
 CXXFLAGS=-O3 -Wall -g #-pg #-fnostack-protector
-CASA_LIBDIR=/opt/casacore/lib
-CASA_INCDIR=-I/opt/casacore/include/ -I/opt/casacore/include/casacore
+CASA_LIBDIR=-L/cm/shared/package/casacore/v2.1.0-gcc-4.9.3/lib -L/cm/shared/package/cfitsio/3380-gcc-4.9.3/lib -L/cm/shared/package/lapack/3.6.0-gcc-4.9.3/lib64
+CASA_INCDIR=-I/cm/shared/package/casacore/v2.1.0-g++-4.9.3/include -I/cm/shared/package/casacore/v2.1.0-g++-4.9.3/include/casacore
 CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio
 #LAPACK=-llapack -lblas
 LAPACK=-lopenblas -lgfortran -lpthread
-LAPACK_DIR=/usr/local/OpenBLAS/lib/
+LAPACK_DIR=/cm/shared/apps/openblas/0.2.8/lib
 #LAPACK_DIR=/usr/lib/atlas/sse/
 
-LDFLAGS=-Wl,--rpath,/usr/local/OpenBLAS/lib/,--rpath,${CASA_LIBDIR}
+LDFLAGS=-Wl,--rpath,/usr/local/OpenBLAS/lib/,${CASA_LIBDIR}
 #LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64
 # -Wl,--hash-style=both
 
 MY_LIBS=-lm -lsagecal
 INCLUDES=-I. -I./lib $(CASA_INCDIR) -I/usr/include
-LIBPATH=-L$(LAPACK_DIR) -L$(CASA_LIBDIR)  -L./lib
+LIBPATH=-L$(LAPACK_DIR) $(CASA_LIBDIR)  -L./lib
 
 #### glib
-GLIBI=-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include/
+GLIBI=-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include/ -I/usr/lib64/glib-2.0/include
 GLIBL=-lglib-2.0
 
 
diff --git a/src/MS/Makefile.gpu b/src/MS/Makefile.gpu
index a878ed7..8a3e2f0 100644
--- a/src/MS/Makefile.gpu
+++ b/src/MS/Makefile.gpu
@@ -1,16 +1,16 @@
 OUTPUT=
 CXX=g++
 CXXFLAGS=-O3 -Wall -g -DHAVE_CUDA -DONE_GPU
-CASA_LIBDIR=/opt/casacore/lib
-CASA_INCDIR=-I/opt/casacore/include/ -I/opt/casacore/include/casacore
+CASA_LIBDIR=-L/cm/shared/package/casacore/v2.1.0-gcc-4.9.3/lib -L/cm/shared/package/cfitsio/3380-gcc-4.9.3/lib -L/cm/shared/package/lapack/3.6.0-gcc-4.9.3/lib64
+CASA_INCDIR=-I/cm/shared/package/casacore/v2.1.0-g++-4.9.3/include -I/cm/shared/package/casacore/v2.1.0-g++-4.9.3/include/casacore
 CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio
 #LAPACK=-llapack -lblas
 LAPACK=-lopenblas -lgfortran -lpthread
-LAPACK_DIR=/usr/local/OpenBLAS/lib/
+LAPACK_DIR=/cm/shared/apps/openblas/0.2.8/lib
 #LAPACK_DIR=/usr/lib/atlas/sse/
 
-CUDAINC=-I/usr/local/cuda/include
-CUDALIB=-L/usr/local/cuda/lib64 -lcuda -lcudart
+CUDAINC=-I/cm/shared/apps/cuda80/toolkit/8.0.44/include/
+CUDALIB=-L/cm/shared/apps/cuda80/toolkit/8.0.44/lib64/ -lcuda -lcudart
 
 CULALIB=-lcublas -lcusolver
 # NVML
@@ -18,7 +18,7 @@ NVML_INC=/usr/include/nvidia/gdk/
 NVML_LIB=-lnvidia-ml -L/usr/lib64/nvidia/
 
 
-LDFLAGS=-Wl,--rpath,/usr/local/OpenBLAS/lib/
+LDFLAGS=-Wl,--rpath,/usr/local/OpenBLAS/lib/,${CASA_LIBDIR}
 #LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64
 # -Wl,--hash-style=both
 
@@ -28,7 +28,7 @@ INCLUDES=-I. -I./lib $(CASA_INCDIR) -I/usr/include $(CUDAINC) -I$(NVML_INC)
 LIBPATH=-L$(LAPACK_DIR) -L$(CASA_LIBDIR)  -L./lib
 
 #### glib
-GLIBI=-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include/
+GLIBI=-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include/ -I/usr/lib64/glib-2.0/include
 GLIBL=-lglib-2.0
 
 
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 8db4ea1..7382d84 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -12,7 +12,7 @@ INCLUDES= -I.
 LIBPATH=
 
 #### glib
-GLIBI=-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include/
+GLIBI=-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include/ -I/usr/lib64/glib-2.0/include
 GLIBL=-lglib-2.0
 
 OBJECTS=readsky.o dataio.o predict.o lmfit_nocuda.o clmfit_nocuda.o lbfgs_nocuda.o myblas.o residual.o robustlm.o updatenu.o robust_lbfgs_nocuda.o rtr_solve.o  rtr_solve_robust.o manifold_average.o consensus_poly.o rtr_solve_robust_admm.o admm_solve.o transforms.o stationbeam.o predict_withbeam.o
diff --git a/src/lib/Makefile.gpu b/src/lib/Makefile.gpu
index 87bc768..635af65 100644
--- a/src/lib/Makefile.gpu
+++ b/src/lib/Makefile.gpu
@@ -1,12 +1,13 @@
 CC=gcc
 CXX=g++
+NVCC=nvcc
 CFLAGS= -Wall -O3 -g -DHAVE_CUDA -DHYBRID_CODE
 CLIBS= -lm -lpthread
 LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread
 
 CUDAINC=/usr/local/cuda/include
 CUDALIB=-L/usr/local/cuda/lib64 -lcuda -lcudart
-NVCC=/usr/local/cuda/bin/nvcc
+#NVCC=/usr/local/cuda/bin/nvcc
 #NVCFLAGS=-arch=sm_35 -g -G --ptxas-options=-v -O3
 NVCFLAGS=-arch=sm_35 --ptxas-options=-v -O3