Revised trace geometry updates