Updated plotting