ISSUE-48 Geometry