Better impl with Rewatch message instead