Some adjusts to the score algorithm