Updated Headbomb's Better Sorting Patches