Updated Plotting Tools