Revert "Revert "Revert "better sorting"""

This reverts commit 5bdaaa72d37ce56c46e9794a72d4604579598d5c.