last change before geometry refactor