Overhaul of index