Reworked the scoring mechanism