Changing indexing logic.