Work with new Indexer world order. Tidier!