Improved graph generation :D