RankNaive
Fix remaining