Title: Improved for Geometry