More index rearranging.