Watching system overhaul