Score logic improvement