Changed so old index works