Tdh merged 2

cruft