Improved watch handling