Minor modification of index