Improve rank ordering