gen_graphs takes advantage of changes from previous commit
Merge branch 'master' into howie
Merging Sarang's newest code into mine.