Added TPS tracking