Get rid of two layer ranking