Improving index, slightly