Revert "Revert "index""

This reverts commit 71550623b9fdafec4e068574c477cbf386372a67.