Moved watch to existing opts code