Major geometry update