improved indexing