Updated scoring system