#250 Keep track of index