Add graphing changes back in