more work on indexing