Better MPI, looks correct