Rework entire index