Updated version of the geometry