partially done for indexer