Moved the plotting functions back to its place