Tdh merged 2

Class-level comment, please