Some further modifications

Of the TCA code