Add score and change to use timeout