make rank/grade consistent