change rank & metric calculation