fix watch method and format