update watch method to polling