Added the -unwatch functionality