Pull in DH's code