TF Via PR Comments