Made more indexing changes