Geometry and hit structure update

No match.