rearranging and fixing scoring