Changed to mpi++