Continue work on TC diagnosis routines