Changes to support graphing for the TO paper.