Added some more graphing