-indexing improvement