Changed graphing and logging