Made indexing work