* Update to TPS watcher