Improved rank system