A few changes to the index