Update sort_by and add some graphs.