Index: improvements