Update to Adam's branch and adding in additional HI variable name lookups