Now should work with MPI