More sorting changes