Catkinized version of geometry-experimental