updated indexing