Updated Score calculation