refactor watches