* Partially fixed non mpi code