Added back the index