Edited my watcher stuff.
Ready
Merge pull request #1 from zhiachong/PL-1234

Pl 1234