Implement better watch