Corrected the logic for watches. Must simpler now