New geometry and optimizations