Better sorting (5/17)

Better sorting