Rank cmd rework