Revert "Revert "index changes""

This reverts commit c0e39d45d0d1fe320d1d4e94f85e126bc36c8086.