Updated for plotting
First figure commit