Reworking of index