Revert "New index"

This reverts commit 645915d0b510aae673eb03456c23336d765f7751.
Revert "Revert "New index""

This reverts commit 9a4c8488e29fe046d49c2690c72922925ffff96c.