Updated for new ranks