refactor alerts to watches