More replacements
Updating for surface mesh