add two pass indexer