fixy
ranking,refactor