Geometrix 2.0