More gradual switching
Adding old indexer back