Updated plotting functions.