Index formatting changes part 2 because Chris