enhancements to the geometry systems