Factor out T2 into its own file