Experiment with new ranking logic
Bug fixed for new ranking logic