Changed order of sorting