taking out the watcher stuff, it doesn't belong here