Amelioration du watcher