Bring new algorithm in
Merge branch 'new-timerank'