Revert "more changes to index"

This reverts commit 71b9ce07a31be866821eb5baeeb13cbf22c0d180.
Revert "Revert "more changes to index""

This reverts commit 4035a36d8fc1715271b86f4ce3c35c454a646e30.