Convert to using public ght api