Fixed watch loop to be in its own method