Implement correct indexing.
Update correct graphs.