Revert to three rank system for now