Updated scoring (final)