Index reworked