Updates to index2