Revert "Index Change"

This reverts commit 1579db3ed5729a0a1c7a6ae4d8ed0d3c45a7b5ce.