Merge "Change the model to fix TCA"