revise TM-CND based recovery