Adjusted for non default mpi locations