Update scoring algorithm

Reinstate these lines and remove the 2 green ones below it