Added Jeff's initial changes to GHT code.