Updated for facilitySorter