Updated plotting stuff