..now with a better sorting