Significantly improved indexing process.