some more simplifying, basic efficiency check, watcher