keep the geometry architecture