Changes to make use of reused geometry