Index updated due to HW6 part2