Edits to try to get 141125 to work with MPI