Parts moved to nmatch3 and nparticles