More TC diagnosis work