Refactored ranking order