Tdh merged 2

good call