more work on indexer