Updated Sorter