Refactoring. SurfacePoly has new mapping.