chanched some Watcher class logic for Linux