Got the graphes a little tidier