made some changes to the way graphs are generated in v2