Changed index to update references