Update Tracker for Shen & TF