Updated scoring calc