converted indexer to singleton