[HG] more work on this.