FIXUP - Split watch callback into two.