added lots of graphs and refactored for build time