diff --git a/tests/Test_meson_field.cc b/tests/Test_meson_field.cc
index 61b5b8be..25d908d7 100644
--- a/tests/Test_meson_field.cc
+++ b/tests/Test_meson_field.cc
@@ -30,6 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace Grid;
 
+const int TSRC = 0;  //timeslice where rho is nonzero
+const int VDIM = 5; //length of each vector
+
 typedef typename DomainWallFermionR::ComplexField ComplexField;
 typedef typename DomainWallFermionR::FermionField FermionField;
 
@@ -38,23 +41,31 @@ int main(int argc, char *argv[])
   // initialization
   Grid_init(&argc, &argv);
   std::cout << GridLogMessage << "Grid initialized" << std::endl;
- 
+
+  // Lattice and rng setup 
   Coordinate latt_size   = GridDefaultLatt();
   Coordinate simd_layout = GridDefaultSimd(4, vComplex::Nsimd());
   Coordinate mpi_layout  = GridDefaultMpi();
   GridCartesian    grid(latt_size,simd_layout,mpi_layout);
-
-  // MesonField lhs and rhs vectors
-  int mfDim = 3;
-  std::vector<FermionField> phi(mfDim,&grid);
-  std::vector<FermionField> rho(mfDim,&grid);
+  int Nt = GridDefaultLatt()[Tp];
+  Lattice<iScalar<vInteger>> t(&grid);
+  LatticeCoordinate(t, Tp);
   std::vector<int> seeds({1,2,3,4});
   GridParallelRNG          pRNG(&grid);
   pRNG.SeedFixedIntegers(seeds);
-  for (unsigned int i = 0; i < mfDim; ++i){
+
+  // MesonField lhs and rhs vectors
+  std::vector<FermionField> phi(VDIM,&grid);
+  std::vector<FermionField> rho(VDIM,&grid);
+  FermionField rho_tmp(&grid);
+  std::cout << GridLogMessage << "Initialising random meson fields" << std::endl;
+  for (unsigned int i = 0; i < VDIM; ++i){
     random(pRNG,phi[i]);
-    random(pRNG,rho[i]); //ideally only nonzero on t=0
+    random(pRNG,rho_tmp); //ideally only nonzero on t=0
+    rho[i] = where((t==TSRC), rho_tmp, 0.*rho_tmp); //ideally only nonzero on t=0
   }
+  std::cout << GridLogMessage << "Meson fields initialised, rho non-zero only for t = " << TSRC << std::endl;
+
   // Gamma matrices used in the contraction
   std::vector<Gamma::Algebra> Gmu = {
     Gamma::Algebra::GammaX,
@@ -71,6 +82,10 @@ int main(int argc, char *argv[])
 	  {1.,1.,1.},
 	  {2.,0.,0.}
   };
+
+  std::cout << GridLogMessage << "Meson fields will be created for " << Gmu.size() << " Gamma matrices and " << momenta.size() << " momenta." << std::endl;
+
+  std::cout << GridLogMessage << "Computing complex phases" << std::endl;
   std::vector<ComplexField> phases(momenta.size(),&grid);
   ComplexField coor(&grid);
   Complex Ci(0.0,1.0);
@@ -84,28 +99,46 @@ int main(int argc, char *argv[])
     }
     phases[j] = exp((Real)(2*M_PI)*Ci*phases[j]);
   }
+  std::cout << GridLogMessage << "Computing complex phases done." << std::endl;
 
-  Eigen::Tensor<ComplexD,5, Eigen::RowMajor> mf(momenta.size(),Gmu.size(),GridDefaultLatt()[3],mfDim,mfDim);
+  Eigen::Tensor<ComplexD,5, Eigen::RowMajor> Mpp(momenta.size(),Gmu.size(),Nt,VDIM,VDIM);
+  Eigen::Tensor<ComplexD,5, Eigen::RowMajor> Mpr(momenta.size(),Gmu.size(),Nt,VDIM,VDIM);
+  Eigen::Tensor<ComplexD,5, Eigen::RowMajor> Mrr(momenta.size(),Gmu.size(),Nt,VDIM,VDIM);
+
+  // timer
+  double start,stop;
 
   //execute meson field routine
-  A2Autils<WilsonImplR>::MesonField(mf,&phi[0],&phi[0],Gmu,phases,3);
-
-  std::cout << mf << std::endl;
+  start = usecond();
+  A2Autils<WilsonImplR>::MesonField(Mpp,&phi[0],&phi[0],Gmu,phases,Tp);
+  stop = usecond();
+  std::cout << GridLogMessage << "M(phi,phi) created, execution time " << stop-start << " us" << std::endl;
+  start = usecond();
+  /* Ideally, for this meson field we could pass TSRC (even better a list of timeslices)
+   * to the routine so that all the compnents which are predictably equal to zero are not computed. */
+  A2Autils<WilsonImplR>::MesonField(Mpr,&phi[0],&rho[0],Gmu,phases,Tp);
+  stop = usecond();
+  std::cout << GridLogMessage << "M(phi,rho) created, execution time " << stop-start << " us" << std::endl;
+  start = usecond();
+  A2Autils<WilsonImplR>::MesonField(Mrr,&rho[0],&rho[0],Gmu,phases,Tp);
+  stop = usecond();
+  std::cout << GridLogMessage << "M(rho,rho) created, execution time " << stop-start << " us" << std::endl;
 
   std::string FileName = "Meson_Fields";
 #ifdef HAVE_HDF5
-    using Default_Reader = Grid::Hdf5Reader;
-    using Default_Writer = Grid::Hdf5Writer;
-    FileName.append(".h5");
+  using Default_Reader = Grid::Hdf5Reader;
+  using Default_Writer = Grid::Hdf5Writer;
+  FileName.append(".h5");
 #else
-    using Default_Reader = Grid::BinaryReader;
-    using Default_Writer = Grid::BinaryWriter;
-    FileName.append(".bin");
+  using Default_Reader = Grid::BinaryReader;
+  using Default_Writer = Grid::BinaryWriter;
+  FileName.append(".bin");
 #endif
 
-
   Default_Writer w(FileName);
-  write(w,"phi_phi",mf);
+  write(w,"phi_phi",Mpp);
+  write(w,"phi_rho",Mpr);
+  write(w,"rho_rho",Mrr);
 
   // epilogue
   std::cout << GridLogMessage << "Grid is finalizing now" << std::endl;