diff --git a/python/gengeom.py b/python/gengeom.py
index b088a067..05b719fc 100644
--- a/python/gengeom.py
+++ b/python/gengeom.py
@@ -1,10 +1,5 @@
-from nglib.meshing import *
-from nglib.geom2d import *
 
 geom = SplineGeometry()
-SplineGeometry.Plot = plotgeom
-SplineGeometry.ShowPoints = plotpointindex
-SplineGeometry.ShowDomains = plotdomainindex
 
 # Define Points
 pi1 = geom.AppendPoint(0,0)
@@ -13,10 +8,10 @@ pi3 = geom.AppendPoint(1,1)
 pi4 = geom.AppendPoint(0,1)
 
 # Define Segments
-geom.AppendSegment(pi1,pi2)
-geom.AppendSegment(pi2,pi3)
-geom.AppendSegment(pi3,pi4)
-geom.AppendSegment(pi4,pi1)
+geom.AppendSegment([pi1,pi2])
+geom.AppendSegment([pi2,pi3])
+geom.AppendSegment([pi3,pi4])
+geom.AppendSegment([pi4,pi1])
 
 # Plot Geometry
 geom.Plot()
diff --git a/python/gengeom_curve.py b/python/gengeom_curve.py
index 5c8b3fb0..d122507c 100644
--- a/python/gengeom_curve.py
+++ b/python/gengeom_curve.py
@@ -1,10 +1,5 @@
-from nglib.meshing import *
-from nglib.geom2d import *
 
 geom = SplineGeometry()
-SplineGeometry.Plot = plotgeom
-SplineGeometry.ShowPoints = plotpointindex
-SplineGeometry.ShowDomains = plotdomainindex
 
 # Define Points
 pi1 = geom.AppendPoint(0,0)
@@ -15,11 +10,11 @@ pi5 = geom.AppendPoint(0.5,1)
 pi6 = geom.AppendPoint(0,1)
 
 # Define Segments
-geom.AppendSegment(pi1,pi2)
-geom.AppendSegment(pi2,pi3)
-geom.AppendSegment(pi3,pi4,pi5)
-geom.AppendSegment(pi5,pi6)
-geom.AppendSegment(pi6,pi1)
+geom.Append(Line(pi1,pi2))
+geom.Append(Line(pi2,pi3))
+geom.Append(Spline3(pi3,pi4,pi5))
+geom.Append(Line(pi5,pi6))
+geom.Append(Line(pi6,pi1))
 
 # Plot Geometry
 geom.Plot()
@@ -29,6 +24,10 @@ geom.ShowPoints()
 # Plot Domain Numbers
 geom.ShowDomains()
 
+# Hide point indices and domain numbers
+geom.ShowPoints(False)
+geom.ShowDomains(False)
+
 # Set Meshing Parameters
 mparam = MeshingParameters()
 mparam.maxh = 0.1