modified Indexer