Updated the plotting functions for the current paper draft