TF: latest changes 2:40pm