Updated with proper graphs and other