add proper watchers