Added graphing capabilities