More work on digest and watch