Added TODO in rank