Updated with graph generation