Modifiy ranking according to [#635]