Revert "New Index"

This reverts commit bcee4a73ad15255cd4cb854f4f1809eda3574957.
Revert "Revert "New Index""

This reverts commit 923aebfbecabf90448143ec1f82390c12aac5567.