Updated index, got rid of Counter