Make watch more flexible for external use.