Improvements to watch