Changed how score is calculated
fix merge conflict