make watch more configurable