better sorting (i hope ...)