Revert "SortPuz"

This reverts commit f678b81134ae8db392a1cc367918f8d83397068e.
Revert "Revert "SortPuz""

This reverts commit 71efd54cacefd926ecd07e6c472293d4a99123a8.