Update new logic for TCs