Added the much needed idle watcher