--- Makefile	2017-05-09 17:35:56.000000000 -0400
+++ Makefile_works	2017-10-24 14:56:43.468810005 -0400
@@ -1,18 +1,18 @@
 USE_MPI = yes
 USE_INTEL = yes
 
-FLAGS = -std=c++11 -g -O3 -I/home/sash2458/apps/eigen -I/home/sash2458/apps/boost_1_57_0/
+FLAGS = -std=c++11 -g -O3 -I$(HOME)/build/eigen-eigen-67e894c6cd8f -I$(BOOST_ROOT)/include
 
 ifeq ($(USE_INTEL), yes) 
 	FLAGS += -qopenmp
 	ifeq ($(USE_MPI), yes) 
-		CXX = mpiicpc
-		CC = mpiicpc
-		LFLAGS = -L/home/sash2458/apps/boost_1_57_0/stage_bla/lib -lboost_serialization -lboost_mpi -lrt
+		CXX = mpic++
+   	CC = mpic++
+   	LFLAGS = -L$(BOOST_ROOT)/lib -lboost_serialization -lboost_mpi -lrt
 	else
 		CXX = icpc
 		CC = icpc
-		LFLAGS = -L/home/sash2458/apps/boost_1_57_0/stage_bla/lib -lboost_serialization -lrt
+		LFLAGS = -L$(BOOST_ROOT)/lib -lboost_serialization -lrt
 		FLAGS += -DSERIAL
 	endif
 else
@@ -20,11 +20,11 @@
 	ifeq ($(USE_MPI), yes) 
 		CXX = mpicxx
 		CC = mpicxx
-		LFLAGS = -L/home/sash2458/apps/boost_1_57_0/stage_bla_gcc/lib -lboost_serialization -lboost_mpi -lrt
+		LFLAGS = -L$(BOOST_ROOT)/lib -lboost_serialization -lboost_mpi -lrt
 	else
 		CXX = g++
 		CC = g++
-		LFLAGS = -L/home/sash2458/apps/boost_1_57_0/stage_bla_gcc/lib -lboost_serialization -lrt
+		LFLAGS = -L$(BOOST_ROOT)/lib -lboost_serialization -lrt
 		FLAGS += -DSERIAL
 	endif
 endif