Minor changes to the graph and how data is retrived