updated issues with watchers