add ranking
merge last version