index: improve previous v2.