WIP index redesign