updated graphs
continued refactoring