reworked mpi correctness