Start on indexing improvements.