Updated graph file names and new functions defs