Updates to Index and Assignment1