Small changes to Index