more work on watch tags