Mild rework of index