Revert "Revert "Change on index""

This reverts commit 7dd547682675b8043cf1ebea3e60252ee17d65fa.