Updated scoring system so it can't be gamed as easily