More barrelSorter changes