Updated plotting functions and plots