Some changes to the mesh structure