New method got confusing, so old sorting restored