More sorting modifications