Better ranking and scoring mechanism