Tdh merged 2

class-level comment please