Edited index to add tracking