TA logic changes