index map now correct