Cleaned up Update Rank