Cleaned up TA Handler