QEP #8: Geometry redesign