Updated Default Geometry (Raffaele)