Add Geometry from Xiao