Changed index to be the new proper