changed order of scoring