#1 improved/moved cdt metrics.