More complete CD and JTHT