Added a very naive implementation of a no-watch option