Update: Little improvement on the plotting